Add crons for spryker.

kierenevans · kierenevans · commit 4eb3569c3366 · 2017-08-22T10:14:10.000+01:00
diff --git a/spryker/Dockerfile.tmpl b/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/
diff --git a/spryker/etc/confd/conf.d/cron_spryker.toml b/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 = [
+]
diff --git a/spryker/etc/confd/conf.d/supervisor_spryker_collectors_crons.conf.toml b/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 = [
+]
diff --git a/spryker/etc/confd/conf.d/supervisor_spryker_crons.conf.toml b/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 = [
+]
diff --git a/spryker/etc/confd/templates/cron/spryker.tmpl b/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
diff --git a/spryker/etc/confd/templates/supervisor/spryker_collectors_crons.conf.tmpl b/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
diff --git a/spryker/etc/confd/templates/supervisor/spryker_crons.conf.tmpl b/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 }}
diff --git a/spryker/nginx/etc/confd/conf.d/nginx_site_internal_requests.conf.toml b/spryker/nginx/etc/confd/conf.d/nginx_site_internal_requests.conf.toml
@@ -0,0 +1,6 @@
+[template]
+src   = "nginx/site_internal_requests.conf.tmpl"
+dest  = "/etc/nginx/sites-available/default-05-site_internal_requests.conf"
+mode  = "0644"
+keys = [
+]
diff --git a/spryker/nginx/etc/confd/templates/nginx/site_internal_requests.conf.tmpl b/spryker/nginx/etc/confd/templates/nginx/site_internal_requests.conf.tmpl
@@ -0,0 +1,3 @@
+if ($http_x_internal_request ~ 1) {
+  set $do_https_redirect 0;
+}
diff --git a/spryker/usr/local/share/container/baseimage-45.sh b/spryker/usr/local/share/container/baseimage-45.sh
@@ -22,6 +22,7 @@ do_templating() {
 
 alias_function do_start do_spryker_start_inner
 do_start() {
+  do_spryker_hosts
   do_spryker_config_create
   do_spryker_start_inner
 }
diff --git a/spryker/usr/local/share/env/30-framework b/spryker/usr/local/share/env/30-framework
@@ -31,8 +31,19 @@ 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}
+export YVES_WEB_SERVER_NAME=${YVES_WEB_SERVER_NAME:-"yves $YVES_HOST"}
+export ZED_WEB_SERVER_NAME=${ZED_WEB_SERVER_NAME:-"zed $ZED_HOST"}
+
+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 BASE_URL_ZED_API=${BASE_URL_ZED_API:-http://zed}
+export BASE_URL_SSL_ZED_API=${BASE_URL_ZED_API:-https://zed}
+
+IS_CRON_RUNNING="$(convert_to_boolean_string "${IS_CRON_RUNNING:-true}")"
+export IS_CRON_RUNNING
 
 export APP_ENDPOINT_STRICT=${APP_ENDPOINT_STRICT:-true}
 
diff --git a/spryker/usr/local/share/spryker/spryker_functions.sh b/spryker/usr/local/share/spryker/spryker_functions.sh
@@ -125,6 +125,10 @@ do_spryker_install() {
 
 do_spryker_migrate() {
   do_spryker_propel_install
+
+  if [ "$APPLICATION_ENV" != "production" ] && [ "$IS_CRON_RUNNING" != "true" ]; then
+    do_spryker_run_collectors
+  fi
 }
 
 do_spryker_run_collectors() {
@@ -155,3 +159,14 @@ do_spryker_setup_search() {
 do_spryker_run_tests() {
   as_code_owner "vendor/bin/codecept run --skip Acceptance"
 }
+
+do_spryker_hosts() {
+    set +e
+    grep -q zed /etc/hosts
+    HOSTS_UPDATED=$?
+    set -e
+    if [ "$HOSTS_UPDATED" != "0" ]; then
+        # zed is required for internal endpoint and others are required for Acceptance tests to not loop over internet in order to resolve those endpoints
+        echo "127.0.0.1 zed $ZED_HOST $YVES_HOST" >> /etc/hosts
+    fi
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+if ($http_x_internal_request ~ 1) {`
	`2`	`+ set $do_https_redirect 0;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ do_templating() {`
`22`	`22`
`23`	`23`	`alias_function do_start do_spryker_start_inner`
`24`	`24`	`do_start() {`
	`25`	`+ do_spryker_hosts`
`25`	`26`	`do_spryker_config_create`
`26`	`27`	`do_spryker_start_inner`
`27`	`28`	`}`