Merge pull request #5 from devsu/dev2

Dev2

Author: c3s4r

Dockerfile

@@ -61,9 +61,6 @@ WORKDIR /var/www
 ADD ./startup.sh /opt/startup.sh
 RUN chmod +x /opt/startup.sh
 
-ADD ./cron.sh /opt/cron.sh
-RUN chmod +x /opt/cron.sh
-
 RUN mkdir -p /var/cache/nginx/microcache
 
 # Avoid sendmail starting as a service

README.md

@@ -70,6 +70,14 @@ The startup.sh script will add the environment variables with MYSQL_ to /etc/php
 *sendmail* usually requires an specific HOSTNAME, run like this:
 
     $ docker run -d -h example.com -v application:/var/www my_mysql_container:mysql devsu/nginx-drupal7
+    
+## Drush Cron Support
+
+To specify *cron* schedule you can set the variable `CRON_SCHEDULE` to the desired settings. Like this:
+
+    $ docker run -d -e CRON_SCHEDULE="10 * * * *" -v application:/var/www my_mysql_container:mysql devsu/nginx-drupal7
+    
+The default value is "*/15 * * * *" (Every fifteen minutes)
 
 ## Changes from base image [iiiepe/docker-nginx-drupal](https://github.com/iiiepe/docker-nginx-drupal)
 

config/supervisor/supervisord-nginx.conf

@@ -3,7 +3,7 @@ nodaemon=true
 
 [program:sendmail]
 priority=2
-command=/usr/sbin/sendmail -bD
+command=/usr/sbin/sendmail -bD -q 5m
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 stderr_logfile=/var/log/supervisor/%(program_name)s.log
 autorestart=true
@@ -22,3 +22,10 @@ stdout_logfile=/var/log/supervisor/nginx.log
 stderr_logfile=/var/log/supervisor/nginx.log
 autorestart=true
 startretries=100
+
+[program:cron]
+priority=3
+command=/usr/sbin/cron -f -L 15
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true

cron.sh

@@ -2,6 +2,11 @@
 
 ENV_CONF=/etc/php5/fpm/pool.d/env.conf
 
+ENV_CRON=/etc/cron.d/drupal
+
+# Force deletion and creation of new file
+rm -f $ENV_CRON
+
 echo "Configuring Nginx and PHP5-FPM with environment variables"
 
 # Update php5-fpm with access to Docker environment variables
@@ -10,6 +15,7 @@ for var in $(env | awk -F= '{print $1}')
 do
 	echo "Adding variable {$var}"
 	echo "env[${var}] = ${!var}" >> $ENV_CONF
+        echo "${var}=${!var}" >> $ENV_CRON
 done
 
 # We need to configure the /etc/hosts file so sendmail works properly
@@ -35,5 +41,73 @@ echo "ff00::0	ip6-mcastprefix" >> /etc/hosts
 echo "ff02::1	ip6-allnodes" >> /etc/hosts
 echo "ff02::2	ip6-allrouters" >> /etc/hosts
 
+# Setting up drush cron to run according CRON_SCHEDULE or 15 min by default
+if [[ -z $CRON_SCHEDULE ]]; then
+        CRON_SCHEDULE="*/15 * * * *"
+else
+        echo "CRON setup to user input"
+fi
+
+# Checking if the cron is already set up
+# Cron job written according http://www.drush.org/en/master/cron/
+CRON_JOB="root /usr/bin/env PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin COLUMNS=72 /usr/local/bin/drush --root=/var/www cron"
+CHECK=$(cat /etc/crontab | grep -o "$CRON_JOB" )
+
+if [[ -z $CHECK ]]; then
+	echo "$CRON_SCHEDULE $CRON_JOB" >> /etc/cron.d/drupal
+	echo "$(date "+%Y-%m-%d %H:%M:%S") CRON_JOB set in /etc/crontab" >> /var/log/supervisor/cron.log
+else
+	echo "$(date "+%Y-%m-%d %H:%M:%S") CRON_JOB already created, doing nothing..." >> /var/log/supervisor/cron.log
+fi
+
+# Adding .htaccess to sites/default/files/ and /tmp according https://www.drupal.org/SA-CORE-2013-003
+
+FILES_HTACCESS="# Turn off all options we don't need.
+Options None
+Options +FollowSymLinks
+
+# Set the catch-all handler to prevent scripts from being executed.
+SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
+<Files *>
+  # Override the handler again if we're run later in the evaluation list.
+  SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
+</Files>
+
+# If we know how to do it safely, disable the PHP engine entirely.
+<IfModule mod_php5.c>
+  php_flag engine off
+</IfModule>"
+
+TMP_HTACCESS="# Turn off all options we don't need.
+Options None
+Options +FollowSymLinks
+
+# Set the catch-all handler to prevent scripts from being executed.
+SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
+<Files *>
+  # Override the handler again if we're run later in the evaluation list.
+  SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
+</Files>
+
+# If we know how to do it safely, disable the PHP engine entirely.
+<IfModule mod_php5.c>
+  php_flag engine off
+</IfModule>
+Deny from all"
+
+# Checking files/.htaccess
+if [[ -e /var/www/sites/default/files/.htaccess ]]; then
+	echo "File already exists"
+else
+	echo "$FILES_HTACCESS" > /var/www/sites/default/files/.htaccess
+fi
+
+# Checking /tmp/.htaccess
+if [[ -e /tmp/.htaccess ]]; then
+	echo "File already exists"
+else
+	echo "$TMP_HTACCESS" > /tmp/.htaccess
+fi
+
 # Runnning supervisor
-/usr/bin/supervisord -n
+/usr/bin/supervisord -n