mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-01-16 13:00:26 +01:00
Code Issues Releases Wiki Activity

Reduce impacted files before merge

Browse Source
This commit is contained in:
matbgn 2022-05-19 00:13:06 +02:00
parent 9479a4ed4d
commit 2932b457e9
6 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.dockerignore
View File

@ -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/

3
.gitignore vendored
View File

@ -24,5 +24,4 @@ plugins/demo
zips
build.php
node_modules
.idea
dist
.idea

20
cmd.sh
View File

@ -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

18
docker-utils/adjust-rights
View File

@ -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 {} \;

5
init_content.sh
View File

@ -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/

2
system/system.php
View File

@ -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);