From 9a94e371aba587ec789d0268934d5de877fa7dc6 Mon Sep 17 00:00:00 2001
From: Andrei Condurachi <andrei@condurachi.ro>
Date: Sun, 22 Nov 2020 11:08:37 +0200
Subject: [PATCH] Permission updates

---
 Dockerfile |  6 ++++--
 run.sh     | 28 ++++++++++++++++------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d8a17f5..bf318c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,8 +81,10 @@ RUN \
 # PHP-FPM vhost config
 COPY vhost.conf /etc/apache2/conf.d/vhost.conf
 
-# Make sure apache can read&right to logs and docroot
-RUN chown -R apache:apache /var/log/apache2 /var/www
+# Make sure apache can read&right to docroot
+RUN chown -R apache:apache /var/www
+# Make sure apache can read&right to logs
+RUN chown -R apache:apache /var/log/apache2
 
 ### Continue execution as Apache user ###
 USER apache
diff --git a/run.sh b/run.sh
index 4ab97c3..61b4515 100644
--- a/run.sh
+++ b/run.sh
@@ -1,22 +1,26 @@
 #!/bin/sh
 
+# Make sure apache can read&right to docroot
+chown -R apache:apache /var/www
+# Make sure apache can read&right to logs
+chown -R apache:apache /var/log/apache2
+
 # syslog option '-Z' was changed to '-t', change this in /etc/conf.d/syslog so that syslog (and then cron) actually starts
 # https://gitlab.alpinelinux.org/alpine/aports/-/issues/9279
 sed -i 's/SYSLOGD_OPTS="-Z"/SYSLOGD_OPTS="-t"/g' /etc/conf.d/syslog
-# Start the kernel log deamon
-service klogd start
-# Start the cron deamon
-service crond start
+# Restart the syslog
+rc-service syslog restart
+# Restart the kernel log deamon
+rc-service klogd restart
+
+# Start the cron deamon by default
+rc-update add crond default && rc-service crond start
+# Start Apache by default
+rc-update add httpd default && rc-service httpd start
+# default PHP-FPM by default
+rc-update add php-fpm7 default && rc-service php-fpm7 start
 
 # Create cron job for Grav maintenance scripts
 (crontab -l; echo "* * * * * cd /var/www/html;/usr/bin/php bin/grav scheduler 1>> /dev/null 2>&1") | crontab -
 # Cron requires that each entry in a crontab end in a newline character. If the last entry in a crontab is missing the newline, cron will consider the crontab (at least partially) broken and refuse to install it.
 (crontab -l; echo "") | crontab -
-
-# Start Apache
-service httpd start
-# Start PHP-FPM
-service php-fpm7 start
-
-# Make sure apache can read&right to docroot
-chown -R apache:apache /var/www