pfizer - move account stuff to test

diff --git a/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
index 600f51587e0b571aa2fc2316c4409761518e463d..e26990c07d0f11148eeaa713cadc5394b841cd8a 100644 (file)
--- a/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
+++ b/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
@@ -10,56 +10,6 @@ site::additional_classes:
   - nodejs
 nodejs::repo_url_suffix: '4.x'
 # temporary stop
-accounts::users:
-  stephan.vits:
-    apply: true
-    sudo: false
-    groups: apache
-  thomas.bussmeyer:
-    apply: true
-    sudo: false
-    groups: apache
-  nikolai.potapov:
-    apply: true
-    sudo: false
-    groups: apache
-  andreas.pinto-koehler:
-    apply: true
-    sudo: false
-    groups: apache
-  deploy.vogel:
-    apply: true
-    sudo: false
-    group: apache
-  willi.martens:
-    apply: true
-    sudo: false
-    groups: apache
-
-
-# TODO: Abwarten auf Ticket: https://jira.pixelpark.com/jira/browse/PPPUPPET-202
-#  csv_upload:
-#    uid: 25113
-#    apply: true
-#    comment: "CSV-Upload-User-from-Pfizer"
-#    sudo: false
-#    group: sftpgroup
-#    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiSPgmPTsHjiklhwnMKZyK71JzyqPtpsFkw5O2Tqc+3IuSw5lQEPtZpEZy4w6Q8NI4vKfAhefmVssj0PgzNG0u5V4dUbWGWGBBdnwG3WwwyLqWHChrHQ8/ODhRKLx+MqAAyrr/M6WDFFf1YLAJbR9yGHKdJeBTJ8X4W20pxZFRr0ZMbM5G7soBs0SvOpJwmVFU0Gsc0er3BIh6FCVYXTVYNuUaMGYxrmRPrCfkLU6J0Zvm2DYspWPcx+PQB9Gp53P69SF18SlIY9KK7Wcr8oRK+eDgWhlmtzMQRfMhoSmrB4SXo4+wObQXDDgOE/UGt378GzwjCS0iFJXfFqvvwQVCTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC6uT2qaHTxdbIzHGR7wynEgBDyxljzehxP3wJWvVj4JNlj]
-
-# Add specific sudo rights for CI Deployment
-sudo::configs:
-  cmd_alias:
-    priority: "05"
-    content: |
-      Cmnd_Alias MKDIRDOC = /bin/mkdir /srv/www/*
-      Cmnd_Alias CHOWNDOC = /bin/chown -R apache\:apache /srv/www/*
-  deploy.vogel:
-    priority: "06"
-    content: |
-      jenkins ALL=(apache) NOPASSWD: ALL
-      jenkins ALL=(ALL) NOPASSWD: MKDIRDOC, CHOWNDOC
-      deploy.vogel ALL=(apache) NOPASSWD: ALL
-      deploy.vogel ALL=(ALL) NOPASSWD: MKDIRDOC, CHOWNDOC
 
 repo::remi_php56: true
 

diff --git a/customer/pfizer/test.yaml b/customer/pfizer/test.yaml
index 568adc3c4d26fb3764beb42357ed307fe67fb9b8..3ec6599451179f20f3c6c25d1d22f5829af1214b 100644 (file)
--- a/customer/pfizer/test.yaml
+++ b/customer/pfizer/test.yaml
@@ -3,32 +3,63 @@ accounts::users:
   thomas.bussmeyer:
     apply: true
     sudo: true
+    groups: apache
   stephan.vits:
     apply: true
     sudo: true
+    groups: apache
   nikolai.potapov:
     apply: true
     sudo: true
+    groups: apache
   romy.pohl:
     apply: true
     sudo: false
+    groups: apache
   deploy.vogel:
     apply: true
     sudo: false
+    group: apache
   andreas.pinto-koehler:
     apply: true
     sudo: false
+    groups: apache
   willi.martens:
     apply: true
     sudo: false
+    group: apache
   markus.baumann:
     apply: true
     sudo: false
+    groups: apache
   jenkins:
     apply: true
     group: apache
+  service.typo3:
+    apply: true
+    sudo: false
+    groups: apache
+
+# TODO: Abwarten auf Ticket: https://jira.pixelpark.com/jira/browse/PPPUPPET-202
+#  csv_upload:
+#    uid: 25113
+#    apply: true
+#    comment: "CSV-Upload-User-from-Pfizer"
+#    sudo: false
+#    group: sftpgroup
+#    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiSPgmPTsHjiklhwnMKZyK71JzyqPtpsFkw5O2Tqc+3IuSw5lQEPtZpEZy4w6Q8NI4vKfAhefmVssj0PgzNG0u5V4dUbWGWGBBdnwG3WwwyLqWHChrHQ8/ODhRKLx+MqAAyrr/M6WDFFf1YLAJbR9yGHKdJeBTJ8X4W20pxZFRr0ZMbM5G7soBs0SvOpJwmVFU0Gsc0er3BIh6FCVYXTVYNuUaMGYxrmRPrCfkLU6J0Zvm2DYspWPcx+PQB9Gp53P69SF18SlIY9KK7Wcr8oRK+eDgWhlmtzMQRfMhoSmrB4SXo4+wObQXDDgOE/UGt378GzwjCS0iFJXfFqvvwQVCTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC6uT2qaHTxdbIzHGR7wynEgBDyxljzehxP3wJWvVj4JNlj]
+
+
 sudo::configs:
-  becomeApache:
+  cmd_alias:
+    priority: "05"
+    content: |
+      Cmnd_Alias MKDIRDOC = /bin/mkdir /srv/www/*
+      Cmnd_Alias CHOWNDOC = /bin/chown -R apache\:apache /srv/www/*
+  deploy.vogel:
     priority: "06"
     content: |
-      jenkins ALL=(apache) NOPASSWD: ALL
\ No newline at end of file
+      jenkins ALL=(apache) NOPASSWD: ALL
+      jenkins ALL=(ALL) NOPASSWD: MKDIRDOC, CHOWNDOC
+      deploy.vogel ALL=(apache) NOPASSWD: ALL
+      deploy.vogel ALL=(ALL) NOPASSWD: MKDIRDOC, CHOWNDOC
\ No newline at end of file