andrew
/
build-grav
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup

This commit is contained in:
Andrei Condurachi 2020-11-20 16:10:28 +02:00
parent bb71aa0c62
commit ca6be9b072
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -22,13 +22,10 @@ RUN sed -i 's/LoadModule mpm_prefork_module/#LoadModule mpm_prefork_module/g' /e
sed -i 's/^Group apache/Group www-data/g' /etc/apache2/httpd.conf && \ sed -i 's/^Group apache/Group www-data/g' /etc/apache2/httpd.conf && \
# Prepare env and create user # Prepare env and create user
mkdir -p /var/log/apache2 && \ mkdir -p /var/log/apache2 && \
groupdel www-data && \
groupmod -g 101 -n www-data apache && \
usermod -g 101 -u 100 -l www-data -d /var/www apache && \
chown www-data:www-data /var/log/apache2 /var/www && \ chown www-data:www-data /var/log/apache2 /var/www && \
# Clean base directory and create required ones # Clean base directory and create required ones
rm -rf /var/www/* && \ rm -rf /var/www/* && \
mkdir -p /run/apache2 /usr/local/apache && \ mkdir -p /usr/local/apache && \
ln -s /usr/lib/apache2 /usr/local/apache/modules && \ ln -s /usr/lib/apache2 /usr/local/apache/modules && \
ln -s /var/log/apache2 /usr/local/apache/logs ln -s /var/log/apache2 /usr/local/apache/logs

9
run.sh
View File

@ -1,10 +1,3 @@
#!/bin/sh #!/bin/sh
CURRENT_APACHE_ID=$(id -u www-data)
if [ "$CURRENT_APACHE_ID" != "$APACHE_UID" ]; then
echo "Fixing permissions for www-data"
usermod -u $APACHE_UID www-data
groupmod -g $APACHE_GID www-data
chown -R www-data:www-data /run/apache2 /var/www
fi
exec /usr/sbin/httpd -DFOREGROUND; exec /usr/sbin/httpd -DFOREGROUND;

6
vhost.conf
View File

@ -4,13 +4,13 @@ ServerName localhost
ServerName localhost ServerName localhost
## Vhost docroot ## Vhost docroot
DocumentRoot /var/www DocumentRoot /var/www/html
## Take .htaccess.local in priority ## Take .htaccess.local in priority
AccessFileName .htaccess.local .htaccess AccessFileName .htaccess.local .htaccess
## PHP-FPM connection ## PHP-FPM connection
ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://php:9000/var/www/$1 ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://php:9000/var/www/html/$1
DirectoryIndex index.php DirectoryIndex index.php
## Directories, ## Directories,
@ -26,7 +26,7 @@ ServerName localhost
Require all denied Require all denied
</DirectoryMatch> </DirectoryMatch>
<Directory "/var/www"> <Directory "/var/www/html">
Options -Indexes +FollowSymLinks +IncludesNOEXEC -MultiViews Options -Indexes +FollowSymLinks +IncludesNOEXEC -MultiViews
AllowOverride All AllowOverride All
Require all granted Require all granted