Merge branch 'release/2.0.6'

wildscamp · Aug 26, 2016 · 6ecfe86 · 6ecfe86
2 parents 5715901 + 0aaa4ec
commit 6ecfe86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Docker Image/bin/create-user-from-directory-owner b/Docker Image/bin/create-user-from-directory-owner
@@ -31,8 +31,8 @@ create_user_from_directory_owner() {
         echo "[Apache User] Created user for uid ($owner_id), and named it '$owner'"
     fi
 
-    sed -i "s/APACHE_RUN_USER=www-data/APACHE_RUN_USER=$owner/g" /etc/apache2/envvars
-    sed -i "s/APACHE_RUN_GROUP=www-data/APACHE_RUN_GROUP=$group/g" /etc/apache2/envvars
+    #sed -i "s/APACHE_RUN_USER=www-data/APACHE_RUN_USER=user/g" /etc/apache2/envvars
+    #sed -i "s/APACHE_RUN_GROUP=www-data/APACHE_RUN_GROUP=user/g" /etc/apache2/envvars
     echo "[Apache User] Set Apache user to $owner and group to $group"
 
     return 0

diff --git a/Docker Image/mods-available/xdebug.ini b/Docker Image/mods-available/xdebug.ini
@@ -11,4 +11,8 @@ xdebug.remote_autostart=0
 
 ; display config
 xdebug.cli_color=1
-xdebug.var_display_max_depth=4
+xdebug.var_display_max_depth=4
+
+; profiler settings
+xdebug.profiler_enable_trigger=1
+xdebug.profiler_output_name=cachegrind.out.%t.%R