Merge pull request #370 from continuouspipe/feature/spryker-crons

Spryker Crons

Author: andytson-inviqa

spryker/Dockerfile.tmpl

@@ -18,4 +18,5 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x > /tmp/install-node.sh \
  && rm -rf /var/lib/apt/lists/*
 
 COPY ./{{WEB_SERVER}}/ /
+COPY ./etc/ /etc/
 COPY ./usr/ /usr/

spryker/etc/confd/conf.d/cron_spryker.toml

@@ -0,0 +1,6 @@
+[template]
+src   = "cron/spryker.tmpl"
+dest  = "/etc/cron.d/spryker"
+mode  = "0644"
+keys = [
+]

spryker/etc/confd/conf.d/supervisor_spryker_collectors_crons.conf.toml

@@ -0,0 +1,6 @@
+[template]
+src   = "supervisor/spryker_collectors_crons.conf.tmpl"
+dest  = "/etc/supervisor/conf.d/spryker_collectors_crons.conf"
+mode  = "0644"
+keys = [
+]

spryker/etc/confd/conf.d/supervisor_spryker_crons.conf.toml

@@ -0,0 +1,6 @@
+[template]
+src   = "supervisor/spryker_crons.conf.tmpl"
+dest  = "/etc/supervisor/conf.d/spryker_crons.conf"
+mode  = "0644"
+keys = [
+]

spryker/etc/confd/templates/cron/spryker.tmpl

@@ -0,0 +1,9 @@
+# don't send any mail
+MAILTO=""
+SUPERVISORCTL="supervisorctl -c /etc/supervisor/supervisord.conf -u supervisor -p supervisor"
+
+*/10 * * * * root $SUPERVISORCTL start mailqueue-registration-send
+* * * * *    root $SUPERVISORCTL start stores-collectors
+* * * * *    root $SUPERVISORCTL start oms-check-condition
+* * * * *    root $SUPERVISORCTL start oms-check-timeout
+0 6 * * *    root $SUPERVISORCTL start oms-clear-locks

spryker/etc/confd/templates/supervisor/spryker_collectors_crons.conf.tmpl

@@ -0,0 +1,12 @@
+[program: stores-collectors]
+command = /usr/local/bin/container run_collectors
+startsecs = 0
+startretries = 0
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+user = root
+autostart = false
+autorestart = false
+priority = 5

spryker/etc/confd/templates/supervisor/spryker_crons.conf.tmpl

@@ -0,0 +1,15 @@
+{{ $nodes := split "mailqueue:registration:send,oms:check-condition,oms:check-timeout,oms:clear-locks" "," }}
+{{ range $nodes }}
+[program: {{ replace ( . ) ":" "-" -1 }}]
+command = /app/vendor/bin/console {{ . }}
+startsecs = 0
+startretries = 0
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+user = www-data
+autostart = false
+autorestart = false
+priority = 5
+{{ end }}

spryker/usr/local/share/env/30-framework

@@ -31,8 +31,10 @@ export YVES_HOST_PROTOCOL=${YVES_HOST_PROTOCOL:-https://}
 export ZED_HOST=${ZED_HOST:-zed}
 export ZED_HOST_PROTOCOL=${ZED_HOST_PROTOCOL:-https://}
 
-export YVES_SESSION_COOKIE_SECURE=${YVES_SESSION_COOKIE_SECURE:-true}
-export ZED_SESSION_COOKIE_SECURE=${ZED_SESSION_COOKIE_SECURE:-true}
+YVES_SESSION_COOKIE_SECURE="$(convert_to_boolean_string "${YVES_SESSION_COOKIE_SECURE:-true}")"
+export YVES_SESSION_COOKIE_SECURE
+ZED_SESSION_COOKIE_SECURE="$(convert_to_boolean_string "${ZED_SESSION_COOKIE_SECURE:-true}")"
+export ZED_SESSION_COOKIE_SECURE
 
 export APP_ENDPOINT_STRICT=${APP_ENDPOINT_STRICT:-true}
 

spryker/usr/local/share/spryker/spryker_functions.sh

@@ -119,6 +119,7 @@ do_spryker_install() {
     do_spryker_import_demodata
     do_spryker_product_label_relations_update
     do_spryker_setup_search
+    do_spryker_app_permissions
     do_spryker_run_collectors
   fi
 }
@@ -128,8 +129,8 @@ do_spryker_migrate() {
 }
 
 do_spryker_run_collectors() {
-  as_code_owner "vendor/bin/console collector:search:export"
-  as_code_owner "vendor/bin/console collector:storage:export"
+  as_app_user "vendor/bin/console collector:search:export"
+  as_app_user "vendor/bin/console collector:storage:export"
 }
 
 do_spryker_propel_install() {