Removing UnitB users from dev-ws-fbb.pixelpark.net

diff --git a/customer/fbb-ws/common.yaml b/customer/fbb-ws/common.yaml
index 1fa0af52eaf0af8642ecc25381b880b266252744..ed329e82460b00b696737ea849d3d034dda9eb89 100644 (file)
--- a/customer/fbb-ws/common.yaml
+++ b/customer/fbb-ws/common.yaml
@@ -15,19 +15,28 @@ accounts::users:
       darksite_xfer:
         key: "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLQgXatMS7km7uYWyrXHxQxwwoK9jEoYEAAEp0xIGtuIe6IFy0Xn7Adi6SxhThvySaKGKfQnvJBL3LBMSqRbjEc="
         type: "ecdsa-sha2-nistp256"
-  # UnitB
-  kristina.matzat:
-    apply: true
-  mateusz.trebus:
-    apply: true
-  cassio.ludewigs:
-    apply: true
-  florian.dorrer:
-    apply: true
-  felix.maier:
-    apply: true
-  holger.voigt:
-    apply: true
+# PP PM
+#  christian.schoenherr
+# PP Entwickler
+#  markus.baumann
+#  harry.teuber
+# UnitB Nutzer
+#  kristina.matzat
+#  mateusz.trebus
+#  cassio.ludewigs
+#  florian.dorrer
+#  felix.maier
+#  holger.voigt
+# FBB Nutzer
+#  beate.hauss
+#  samir.djulancic
+#  thoren.mcdole
+#  frank.grunwald
+#  tobias.gutknecht
+#  christian.hentke
+#  christian.steinke
+#  dirk.bodeutsch
+#  thomas.riedel
 
 
 #####################################################

diff --git a/customer/fbb-ws/dev-ws-fbb.pixelpark.net.yaml b/customer/fbb-ws/dev-ws-fbb.pixelpark.net.yaml
index 5d8e401899d4261c7b1bb3f16e2520f30826c2c6..211a1bd0b148a9b04ba71275c806a0a59db1dfa7 100644 (file)
--- a/customer/fbb-ws/dev-ws-fbb.pixelpark.net.yaml
+++ b/customer/fbb-ws/dev-ws-fbb.pixelpark.net.yaml
@@ -4,6 +4,10 @@ infra::additional_classes:
   - infra::profile::apache_php
   - infra::profile::postfix
 
+group:
+  fbb:
+    ensure: 'present'
+
 accounts::users:
   #Pixelpark
   christian.schoenherr:

diff --git a/customer/fbb-ws/test.yaml b/customer/fbb-ws/test.yaml
index 8f6f7f811d6cfe442a08e278a6f022498e966188..e2f1bd18ee7e1eaf2b581a59c8529cce4544281f 100644 (file)
--- a/customer/fbb-ws/test.yaml
+++ b/customer/fbb-ws/test.yaml
@@ -10,11 +10,11 @@ accounts::users:
     sudo: false
   markus.baumann:
     apply: true
-    sudo: true
+    sudo: false
     #disable before live
   harry.teuber:
     apply: true
-    sudo: true
+    sudo: false
     #disable before live
   jenkins:
     apply: true

diff --git a/customer/fbb-www/common.yaml b/customer/fbb-www/common.yaml
index e11ed5653cb80df66ff3bf43907549e68c1ad4ee..10476e7f42da2b99a782cf0b16c97dcbdb0fe81e 100644 (file)
--- a/customer/fbb-www/common.yaml
+++ b/customer/fbb-www/common.yaml
@@ -16,17 +16,25 @@ infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient-fbb'
 
 #####################################################
 # Externe User:
-accounts::users:
-  # UnitB
-  kristina.matzat:
-    apply: true
-  mateusz.trebus:
-    apply: true
-  cassio.ludewigs:
-    apply: true
-  florian.dorrer:
-    apply: true
-  felix.maier:
-    apply: true
-  holger.voigt:
-    apply: true
+# PP PM
+#  christian.schoenherr
+# PP Entwickler
+#  markus.baumann
+#  harry.teuber
+# UnitB Nutzer
+#  kristina.matzat
+#  mateusz.trebus
+#  cassio.ludewigs
+#  florian.dorrer
+#  felix.maier
+#  holger.voigt
+# FBB Nutzer
+#  beate.hauss
+#  samir.djulancic
+#  thoren.mcdole
+#  frank.grunwald
+#  tobias.gutknecht
+#  christian.hentke
+#  christian.steinke
+#  dirk.bodeutsch
+#  thomas.riedel