fbb removed xymon class

diff --git a/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml b/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
index aac975aa2f08b7adaa2ba16ea234e6c227af08af..de7702d723614a98cec88d13acef81f1d17c934f 100644 (file)
--- a/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
@@ -1,6 +1,7 @@
 ---
-infra::role: base
+infra::role: base_for_old_systems # because we don't need xymon
 infra::additional_classes:
+  - accounts
   - infra::profile::apache_php
   - infra::profile::postfix
   - infra::profile::clamav

diff --git a/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml b/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml
index dc393c28ce5e0b19f80db72e265c5f0a62318dbd..2c0c13524d93fcce9267de385a21991be05e8ed6 100644 (file)
--- a/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml
@@ -1,6 +1,4 @@
 ---
-infra::role: base
-
 infra::profile::cron::cronjobs:
   flugplan-import:
     minute: '0-59/6'
@@ -20,4 +18,4 @@ infra::profile::cron::cronjobs:
     weekday: '*'
     user: root
     environment:
-      - 'PATH="/usr/bin:/bin"'
\ No newline at end of file
+      - 'PATH="/usr/bin:/bin"'

diff --git a/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml b/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml
index 816570089bd16ece7b85d08e2380b7e236e6560b..b79dec7a94a38f6f2ade7a62e10a7100af60975c 100644 (file)
--- a/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml
@@ -1,6 +1,4 @@
 ---
-infra::role: base
-
 infra::profile::cron::cronjobs:
   flugplan-import:
     minute: '3-59/6'
@@ -9,4 +7,4 @@ infra::profile::cron::cronjobs:
   archive_flight_table:
     minute: '5'
   archive_flight_table_monitoring:
-    minute: '5'
\ No newline at end of file
+    minute: '5'

diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml
index 526f2e44bd0dda9e9bf8ed94e89aec6483f6c864..1cf0801f2e061f0983d29f43e8ab2d1c063876c8 100644 (file)
--- a/customer/fbb-www/production.yaml
+++ b/customer/fbb-www/production.yaml
@@ -1,5 +1,7 @@
 ---
+infra::role: base_for_old_systems # because we don't need xymon
 infra::additional_classes:
+  - accounts
   - infra::profile::apache_php
   - infra::profile::postfix
   - infra::profile::cron

diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml
index e3c36d9d50e2f299814bc9e7a0866e687bfb1910..79d89664bd1464d7893daee46896d9e498ce9113 100644 (file)
--- a/customer/fbb-www/test.yaml
+++ b/customer/fbb-www/test.yaml
@@ -1,5 +1,7 @@
 ---
+infra::role: base_for_old_systems # because we don't need xymon
 infra::additional_classes:
+  - accounts
   - infra::profile::apache_php
   - infra::profile::postfix
   - infra::profile::cron

diff --git a/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml b/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml
index 1d1031c73f82e8a6adee15287866a89d34f22a06..2c0c13524d93fcce9267de385a21991be05e8ed6 100644 (file)
--- a/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/tst-www01-fbb.pixelpark.net.yaml
@@ -1,6 +1,4 @@
 ---
-infra::role: base
-
 infra::profile::cron::cronjobs:
   flugplan-import:
     minute: '0-59/6'

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