From 1f736001327d5c8e00fc63a185341b2ce6771e6d Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Thu, 6 Jul 2017 16:25:11 +0200
Subject: [PATCH] fbb-www - cronjobs flug_archive + unitb sudo rights for
 unitb.cron for testing

---
 customer/fbb-www/test.yaml                    | 22 +++++++++++++++++++
 .../fbb-www/tst-www01-fbb.pixelpark.net.yaml  | 20 +----------------
 .../fbb-www/tst-www02-fbb.pixelpark.net.yaml  |  6 ++++-
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml
index 37070890..dda1f294 100644
--- 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 8d10c908..357fd8e8 100644
--- 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 6d1e7a19..31e634df 100644
--- 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
-- 
2.39.5