bug6020: fixed crontab-download-new-archived-trac-trac-events;

moved central_reverse_proxy crontab snippets that are used only there
into the environment_scripts/central_reverse_proxy folder structure and
adjusted folder names specificially

configuration/crontabs/crontab-download-new-archived-trac-trac-events

@@ -1 +0,0 @@
-15 12 * * * PATH_OF_GIT_HOME_DIR_TO_REPLACE/configuration/downloadNewArchivedTracTracEvents.sh PATH_OF_HOME_DIR_TO_REPLACE/static/TracTracTracks "PATH_OF_GIT_HOME_DIR_TO_REPLACE">PATH_OF_HOME_DIR_TO_REPLACE/downloadNewArchivedTracTracEvents.out 2>PATH_OF_HOME_DIR_TO_REPLACE/downloadNewArchivedTracTracEvents.err

configuration/crontabs/crontab-syncgit

@@ -1 +0,0 @@
-*/10 * * * * export PATH=/bin:/usr/bin:/usr/local/bin; syncgit PATH_OF_GIT_HOME_DIR_TO_REPLACE

configuration/downloadNewArchivedTracTracEvents.sh

@@ -1 +0,0 @@
-environments_scripts/central_reverse_proxy/files/usr/local/bin/downloadNewArchivedTracTracEvents.sh

configuration/environments_scripts/central_reverse_proxy/users/wiki/crontab-download-new-archived-trac-trac-events

@@ -1 +0,0 @@
-../../../../crontabs/crontab-download-new-archived-trac-trac-events

configuration/environments_scripts/central_reverse_proxy/users/wiki/crontab-download-new-archived-trac-trac-events

@@ -0,0 +1 @@
+15 12 * * * export PATH=/bin:/usr/bin:/usr/local/bin; downloadNewArchivedTracTracEvents.sh /home/trac/static/TracTracTracks "/home/wiki/gitwiki" >/home/wiki/downloadNewArchivedTracTracEvents.out 2>/home/wiki/downloadNewArchivedTracTracEvents.err

configuration/environments_scripts/central_reverse_proxy/users/wiki/crontab-syncgit

@@ -1 +0,0 @@
-../../../../crontabs/crontab-syncgit

configuration/environments_scripts/central_reverse_proxy/users/wiki/crontab-syncgit

@@ -0,0 +1 @@
+*/10 * * * * export PATH=/bin:/usr/bin:/usr/local/bin; syncgit /home/wiki/gitwiki

configuration/environments_scripts/sailing_server/files/usr/local/bin/imageupgrade

@@ -11,5 +11,5 @@ clean_logrotate_target
 clean_httpd_logs
 clean_servers_dir
 clean_startup_logs
-build_crontab_and_setup_files sailing_server sailing code
+build_crontab_and_setup_files sailing_server sailing no-checked-out-workspace
 finalize

configuration/environments_scripts/sailing_server/files/usr/local/bin/sailing

@@ -26,36 +26,34 @@ REBOOT_INDICATOR=/var/lib/sailing/is-rebooted
 mkdir --parents $( dirname ${REBOOT_INDICATOR} )
 SSH_KEY_READER_BEARER_TOKEN=/root/ssh-key-reader.token
 
-echo "Executing with $1 at `date`" >>/var/log/sailing.err
+echo "Executing with $1 at `date`"
 
 start_servers() {
-    /usr/local/bin/update_authorized_keys_for_landscape_managers $( cat ${SSH_KEY_READER_BEARER_TOKEN} ) https://security-service.sapsailing.com /root 2>&1 >>/var/log/sailing.err
-    chown root /usr/local/bin/cp_root_mail_properties
-    chgrp root /usr/local/bin/cp_root_mail_properties
+    /usr/local/bin/update_authorized_keys_for_landscape_managers $( cat ${SSH_KEY_READER_BEARER_TOKEN} ) https://security-service.sapsailing.com /root
+    chown root:root /usr/local/bin/cp_root_mail_properties
     chmod 755 /usr/local/bin/cp_root_mail_properties
     if which $EC2_METADATA_CMD && $EC2_METADATA_CMD -d | sed "s/user-data\: //g" | grep "^image-upgrade$"; then
-        echo "Found image-upgrade in EC2 user data; upgrading image, then probably shutting down for AMI creation depending on the no-shutdown user data string..." >>/var/log/sailing.err
-        /usr/local/bin/imageupgrade
+        echo "Found image-upgrade in EC2 user data; not configuring/starting sailing server processes"
     else
-        echo "No image-upgrade request found in EC2 user data $($EC2_METADATA_CMD -d); proceeding with regular server launch..." >>/var/log/sailing.err
-        echo "Servers to launch: ${JAVA_START_INSTANCES}" >>/var/log/sailing.err
+        echo "No image-upgrade request found in EC2 user data $($EC2_METADATA_CMD -d); proceeding with regular server launch..."
+        echo "Servers to launch: ${JAVA_START_INSTANCES}"
         if [ -f "${REBOOT_INDICATOR}" ]; then
-            echo "This is a re-boot. No EC2 user data is evaluated for server configuration; no server configuration is performed. Only configured applications are launched." >>/var/log/sailing.err
+            echo "This is a re-boot. No EC2 user data is evaluated for server configuration; no server configuration is performed. Only configured applications are launched."
             for conf in ${JAVA_START_INSTANCES}; do
-                su - sailing -c "cd ${SERVERS_DIR}/${conf} && ./start" 2>>/var/log/sailing.err >>/var/log/sailing.err
+                su - sailing -c "cd ${SERVERS_DIR}/${conf} && ./start"
             done
         else
-            echo "This is a first-time boot. EC2 user data is evaluated for potential application deployment and configuration, and applications are launched." >>/var/log/sailing.err
-            echo "Initializing local MongoDB replica set \"replica\"..." >>/var/log/sailing.err
+            echo "This is a first-time boot. EC2 user data is evaluated for potential application deployment and configuration, and applications are launched."
+            echo "Initializing local MongoDB replica set \"replica\"..."
             while ! echo "rs.initiate()" | mongo; do
-                echo "MongoDB not ready yet; waiting and trying again..." >>/var/log/sailing.err
+                echo "MongoDB not ready yet; waiting and trying again..."
                 sleep 5
             done
             FIRST_SERVER=$( eval $( ${EC2_METADATA_CMD} -d | sed -e 's/^user-data: //' ); echo $SERVER_NAME )
             if [ "${FIRST_SERVER}" = "" ]; then
-                echo "No SERVER_NAME provided; not configuring/starting any application processes" >>/var/log/sailing.err
+                echo "No SERVER_NAME provided; not configuring/starting any application processes"
             else
-                echo "Server to configure and start: ${FIRST_SERVER}" >>/var/log/sailing.err
+                echo "Server to configure and start: ${FIRST_SERVER}"
                 configure_and_start_server "${FIRST_SERVER}"
             fi
             echo 1 >"${REBOOT_INDICATOR}"
@@ -74,9 +72,9 @@ configure_and_start_server() {
   chgrp sailing "${SERVERS_DIR}/${conf}"
   # If there is a secret /root/mail.properties, copy it into the default server's configuration directory:
   /usr/local/bin/cp_root_mail_properties "${conf}"
-  su - sailing -c "cd ${SERVERS_DIR}/${conf} && refreshInstance.sh auto-install; ./start" 2>>/var/log/sailing.err >>/var/log/sailing.err
+  su - sailing -c "cd ${SERVERS_DIR}/${conf} && refreshInstance.sh auto-install; ./start"
   pushd ${SERVERS_DIR}/${conf}
-  ./defineReverseProxyMappings.sh 2>>/var/log/sailing.err >>/var/log/sailing.err
+  ./defineReverseProxyMappings.sh
   popd
   RETVAL=$?
   [ $RETVAL -eq 0 ] && success || failure
@@ -84,7 +82,7 @@ configure_and_start_server() {
 
 stop_servers() {
     for conf in $JAVA_START_INSTANCES; do
-        echo "Stopping Java server $conf" >> /var/log/sailing.err
+        echo "Stopping Java server $conf"
         su - sailing -c "cd $SERVERS_DIR/$conf && ./stop"
         RETVAL=$?
         [ $RETVAL -eq 0 ] && success || failure
@@ -93,7 +91,7 @@ stop_servers() {
 }
 
 sync_logs() {
-    echo "Executing logrotate followed by a sync to ensure that logs are synchronized" >> /var/log/sailing.err
+    echo "Executing logrotate followed by a sync to ensure that logs are synchronized"
     logrotate -f /etc/logrotate.conf
     sync
 }

configuration/syncgit

@@ -1 +0,0 @@
-environments_scripts/repo/usr/local/bin/syncgit