From 08335dfb459824090dfff8c3b9fab189e8d26e03 Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Thu, 13 Jul 2017 11:54:19 +0200
Subject: [PATCH] fbb-www - Unit-B-Cronjobs on Prod

---
 .../fbb-www/prd-www01-fbb.pixelpark.net.yaml  | 49 ++---------------
 .../fbb-www/prd-www02-fbb.pixelpark.net.yaml  | 10 ++++
 customer/fbb-www/production.yaml              | 52 +++++++++++++++++++
 3 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml b/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml
index edbbf742..dc393c28 100644
--- a/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml
@@ -3,55 +3,14 @@ infra::role: base
 
 infra::profile::cron::cronjobs:
   flugplan-import:
-    command: '/bin/bash /opt/app/web_alt/flugplan/SH_Sources/poll.sh >> /var/log/unitb/flugplan-import.log 2>> /var/log/unitb/flugplan-import.log'
-    minute: '*/2'
-    hour: '*'
-    date: '*'
-    month: '*'
-    weekday: '*'
-    user: unitb.cron
-    environment:
-      - 'PATH="/usr/bin:/bin"'
+    minute: '0-59/6'
   wetter-import:
-    command: '/bin/bash /opt/app/web_alt/wetter/import.sh >> /var/log/unitb/wetter-import.log 2>> /var/log/unitb/wetter-import.log'
     minute: '45'
-    hour: '1,5,10,15,18,22'
-    date: '*'
-    month: '*'
-    weekday: '*'
-    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"'
-#  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'
-#    hour: '4'
-#    date: '*'
-#    month: '*'
-#    weekday: '*'
-#    user: unitb.cron
-#    environment:
-#      - 'PATH="/usr/bin:/bin"'
+  archive_flight_table_monitoring:
+    minute: '0'
+  # Nur auf einen Server
   flugplanDump:
     command: '/bin/bash /opt/app/web_alt/flugplan/SH_Sources/flugplanDump.sh  >> /var/log/unitb/flugplanDump.log 2>> /var/log/unitb/flugplanDump.log'
     minute: '*/10'
diff --git a/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml b/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml
index 3b0442d3..81657008 100644
--- a/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml
@@ -1,2 +1,12 @@
 ---
 infra::role: base
+
+infra::profile::cron::cronjobs:
+  flugplan-import:
+    minute: '3-59/6'
+  wetter-import:
+    minute: '50'
+  archive_flight_table:
+    minute: '5'
+  archive_flight_table_monitoring:
+    minute: '5'
\ No newline at end of file
diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml
index 51dcde9c..c7482ff2 100644
--- a/customer/fbb-www/production.yaml
+++ b/customer/fbb-www/production.yaml
@@ -110,6 +110,58 @@ sudo::configs:
       florian.dorrer ALL=(web) NOPASSWD: ALL
       felix.maier ALL=(web) NOPASSWD: ALL
 
+infra::profile::cron::cronjobs:
+  flugplan-import:
+    command: '/bin/bash /opt/app/web_alt/flugplan/SH_Sources/poll.sh >> /var/log/unitb/flugplan-import.log 2>> /var/log/unitb/flugplan-import.log'
+    minute: '*/6'
+    hour: '*'
+    date: '*'
+    month: '*'
+    weekday: '*'
+    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"'
+  wetter-import:
+    command: '/bin/bash /opt/app/web_alt/wetter/import.sh >> /var/log/unitb/wetter-import.log 2>> /var/log/unitb/wetter-import.log'
+    minute: '45'
+    hour: '1,5,10,15,18,22'
+    date: '*'
+    month: '*'
+    weekday: '*'
+    user: unitb.cron
+    environment:
+      - 'PATH="/usr/bin:/bin"'
+  cleanout_upload_dir:
+    command: '/bin/bash /opt/app/web_alt/flugplan/SH_Sources/cleandirs.sh  >> /var/log/unitb/clean-uploaded_files.log 2>> /var/log/unitb/clean-uploaded_files.log'
+    minute: '0'
+    hour: '4'
+    date: '*'
+    month: '*'
+    weekday: '*'
+    user: unitb.cron
+    environment:
+      - 'PATH="/usr/bin:/bin"'
+
 infra::profile::postfix::transport_maps_source: 'maps/transport-fbb'
 
 repo::remi_php71: true
-- 
2.39.5