fbb-www - cronjobs flug_archive + unitb sudo rights for unitb.cron for

testing

diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml
index 370708908eb2fe5ae5bf7e6eb7430f03ea5dc83a..dda1f294a663a9ca04212f8afc838f2136117bf6 100644 (file)
--- a/customer/fbb-www/test.yaml
+++ b/customer/fbb-www/test.yaml
@@ -132,6 +132,8 @@ sudo::configs:
       felix.maier ALL=(web) NOPASSWD: ALL
       florian.dorrer ALL=(fiona) NOPASSWD: ALL
       felix.maier ALL=(fiona) NOPASSWD: ALL
+      florian.dorrer ALL=(unitb.cron) NOPASSWD: ALL
+      felix.maier ALL=(unitb.cron) NOPASSWD: ALL
 
 infra::profile::cron::cronjobs:
   flugplan-import:
@@ -144,6 +146,26 @@ infra::profile::cron::cronjobs:
     user: unitb.cron
     environment:
       - 'PATH="/usr/bin:/bin"'
+  archive_flight_table:
+    command: '/bin/bash /opt/app/web_alt/flugplan/SH_Sources/flight_archive.sh  >> /var/log/unitb/flight_archive.log 2>> /var/log/unitb/flight_archive.log'
+    minute: '0'
+    hour: '2'
+    date: '*'
+    month: '*'
+    weekday: '*'
+    user: unitb.cron
+    environment:
+      - 'PATH="/usr/bin:/bin"'
+  archive_flight_table_monitoring:
+    command: '/bin/bash /opt/app/web_alt/flugplan/SH_Sources/flight_archive_monitoring.sh  >> /var/log/unitb/flight_archive.log 2>> /var/log/unitb/flight_archive.log'
+    minute: '0'
+    hour: '6'
+    date: '*'
+    month: '*'
+    weekday: '*'
+    user: unitb.cron
+    environment:
+      - 'PATH="/usr/bin:/bin"'
 #
 # Other scripts for cron
 # /opt/app/web/dialogforumRSS/import.sh

diff --git a/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml b/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml
index 8d10c908a459cd8bd22f3d6030bddee2813172e8..357fd8e8d7dae8945d9f3b388dd1595b748d1d69 100644 (file)
--- a/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml
@@ -15,27 +15,9 @@ infra::profile::cron::cronjobs:
     environment:
       - 'PATH="/usr/bin:/bin"'
   archive_flight_table:
-    command: '/bin/bash /opt/app/web_alt/flugplan/SH_Sources/flight_archive.sh  >> /var/log/unitb/flight_archive.log 2>> /var/log/unitb/flight_archive.log'
-    minute: '*/5'
-    # minute: '0'
-    # hour: '2'
-    hour: '*'
-    date: '*'
-    month: '*'
-    weekday: '*'
-    user: unitb.cron
-    environment:
-      - 'PATH="/usr/bin:/bin"'
+    minute: '0'
   archive_flight_table_monitoring:
-    command: '/bin/bash /opt/app/web_alt/flugplan/SH_Sources/flight_archive_monitoring.sh  >> /var/log/unitb/flight_archive.log 2>> /var/log/unitb/flight_archive.log'
     minute: '0'
-    hour: '6'
-    date: '*'
-    month: '*'
-    weekday: '*'
-    user: unitb.cron
-    environment:
-      - 'PATH="/usr/bin:/bin"'
   cleanout_upload_dir:
     command: '/bin/bash /opt/app/web/jobs/cleandirs.sh  >> /var/log/unitb/clean-uploaded_files.log 2>> /var/log/unitb/clean-uploaded_files.log'
     minute: '0'

diff --git a/customer/fbb-www/tst-www02-fbb.pixelpark.net.yaml b/customer/fbb-www/tst-www02-fbb.pixelpark.net.yaml
index 6d1e7a19b7467e9dd0532f3dc6b836b735604163..31e634dfee48c6c295f707f814c0d7662d91595e 100644 (file)
--- a/customer/fbb-www/tst-www02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/tst-www02-fbb.pixelpark.net.yaml
@@ -3,4 +3,8 @@ infra::role: base
 
 infra::profile::cron::cronjobs:
   flugplan-import:
-    minute: '3-59/6'
\ No newline at end of file
+    minute: '3-59/6'
+  archive_flight_table:
+    minute: '5'
+  archive_flight_table_monitoring:
+    minute: '5'
\ No newline at end of file