diff --git a/.dockerignore b/.dockerignore index 9565dc7..5ae231e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,10 +8,7 @@ !composer* !index.php -!cmd.sh -!init_content.sh - -# Allow example files and directories +# Allow content files and directories !cache/ !content/ !data/ diff --git a/.gitignore b/.gitignore index eb781af..ae4f2a8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,5 +24,4 @@ plugins/demo zips build.php node_modules -.idea -dist \ No newline at end of file +.idea \ No newline at end of file diff --git a/cmd.sh b/cmd.sh deleted file mode 100644 index e1f2b3d..0000000 --- a/cmd.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -find /var/www/html/content -maxdepth 0 -empty -exec /init_content.sh \; -if [ "$TYPEMILL_UID" ] || [ "$TYPEMILL_GID" ]; then - usermod -u $TYPEMILL_UID www-data - groupmod -g $TYPEMILL_GID www-data - chown -R www-data:www-data /var/www/html -fi -chown -R www-data:www-data /var/www/html/cache -find /var/www/html/cache -type d -exec chmod 770 {} \; -find /var/www/html/cache -type f -exec chmod 660 {} \; -chown -R www-data:www-data /var/www/html/content -find /var/www/html/content -type d -exec chmod 770 {} \; -find /var/www/html/content -type f -exec chmod 660 {} \; -chown -R www-data:www-data /var/www/html/media -find /var/www/html/media -type d -exec chmod 770 {} \; -find /var/www/html/media -type f -exec chmod 660 {} \; -chown -R www-data:www-data /var/www/html/settings -find /var/www/html/settings -type d -exec chmod 770 {} \; -find /var/www/html/settings -type f -exec chmod 660 {} \; -apache2-foreground diff --git a/docker-utils/adjust-rights b/docker-utils/adjust-rights deleted file mode 100644 index 5993c61..0000000 --- a/docker-utils/adjust-rights +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -#chown -R www-data:www-data /var/www/html -#find /var/www/html -type d -exec chmod 570 {} \; -#find /var/www/html -type f -exec chmod 460 {} \; -echo TestMBO1 -chown -R www-data:www-data /var/www/html/cache -find /var/www/html/cache -type d -exec chmod 770 {} \; -find /var/www/html/cache -type f -exec chmod 660 {} \; -chown -R www-data:www-data /var/www/html/content -find /var/www/html/content -type d -exec chmod 770 {} \; -find /var/www/html/content -type f -exec chmod 660 {} \; -chown -R www-data:www-data /var/www/html/media -find /var/www/html/media -type d -exec chmod 770 {} \; -find /var/www/html/media -type f -exec chmod 660 {} \; -chown -R www-data:www-data /var/www/html/settings -find /var/www/html/settings -type d -exec chmod 770 {} \; -find /var/www/html/settings -type f -exec chmod 660 {} \; \ No newline at end of file diff --git a/init_content.sh b/init_content.sh deleted file mode 100644 index f17a5a3..0000000 --- a/init_content.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -echo "**************************************************************************" -echo "! Content directory is empty. It will be initialized with default content." -echo "**************************************************************************" -cp -R /var/www/html/content.orig/* /var/www/html/content/ diff --git a/system/system.php b/system/system.php index cd33c34..62829c7 100644 --- a/system/system.php +++ b/system/system.php @@ -29,7 +29,7 @@ $settings = Typemill\Settings::loadSettings(); /**************************** * HANDLE DISPLAY ERRORS * ****************************/ -//$settings['settings']['displayErrorDetails'] = true; + if(isset($settings['settings']['displayErrorDetails']) && $settings['settings']['displayErrorDetails']) { ini_set('display_errors', 1);