From 3f5aa7197ef7ace10cbe739a55243f392fb84a01 Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Mon, 28 Nov 2016 14:55:59 +0100
Subject: [PATCH] pfizer - cleanup accounts

---
 .../dev-web01-pfizer-de.pixelpark.net.yaml    | 39 -----------------
 .../dev-web02-pfizer-de.pixelpark.net.yaml    | 42 -------------------
 customer/pfizer/development.yaml              | 14 +++++++
 3 files changed, 14 insertions(+), 81 deletions(-)

diff --git a/customer/pfizer/dev-web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/dev-web01-pfizer-de.pixelpark.net.yaml
index 3fcd966f..0141b99a 100644
--- a/customer/pfizer/dev-web01-pfizer-de.pixelpark.net.yaml
+++ b/customer/pfizer/dev-web01-pfizer-de.pixelpark.net.yaml
@@ -5,45 +5,6 @@ site::additional_classes:
   - site::profile::typo3
   - site::profile::mysql_server
 
-accounts::users:
-  stephan.vits:
-    apply: true
-    sudo: true
-    groups: apache
-  thomas.bussmeyer:
-    apply: true
-    sudo: true
-    groups: apache
-  nikolai.potapov:
-    apply: true
-    sudo: true
-    groups: apache
-  andreas.pinto-koehler:
-    apply: true
-    sudo: true
-    groups: apache
-  willi.martens:
-    apply: true
-    sudo: true
-    groups: apache
-  deploy.vogel:
-    apply: true
-    sudo: true
-    group: apache
-  service.typo3:
-    apply: true
-    sudo: true
-    group: 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,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZjprKA9BDrGcfkKwTe8ygEzAA/iY5FyS3y8Txz6sfMhAOFWogiDLgejAfBQ+eEw3r0s5YzM/lC7wiSDdj52RB/6J5GyHWb3NBjOH4/Yz0ZOClAzCPH+hmuLhbaEZGxxPsbTS1asX3LTKrJKhXpWQniW+7KlW/3M23R9UeJG+NOseexIc05YaoMHNre2fsNO1kd0Yoqpe5e4QpXyS4uhLfY2UHfxqoqOpoq/9kap/DS8Ztyje7z7uebNQmh++gTFyo+eWdki+If/wzp8E46dBl5RN85v4d8YntMOx+gEA372sLGDMkTvlPGvOGDHXu1KucIzAkOPN4m3Kxnkv85+GgjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBjEEpShEGrw6K/IxkIL5JQgBCktXY/CiIR0X6WbV0gw30X]
-
 repo::remi_php56: true
 
 php::settings:
diff --git a/customer/pfizer/dev-web02-pfizer-de.pixelpark.net.yaml b/customer/pfizer/dev-web02-pfizer-de.pixelpark.net.yaml
index ad8a8377..08692202 100644
--- a/customer/pfizer/dev-web02-pfizer-de.pixelpark.net.yaml
+++ b/customer/pfizer/dev-web02-pfizer-de.pixelpark.net.yaml
@@ -4,48 +4,6 @@ site::additional_classes:
   - site::profile::typo3
   - site::profile::mysql_server
 
-accounts::users:
-  stephan.vits:
-    apply: true
-    sudo: true
-    groups: apache
-  thomas.bussmeyer:
-    apply: true
-    sudo: true
-    groups: apache
-  romy.pohl:
-    apply: true
-    sudo: true
-    groups: apache
-  nikolai.potapov:
-    apply: true
-    sudo: true
-    groups: apache
-  andreas.pinto-koehler:
-    apply: true
-    sudo: true
-    groups: apache
-  willi.martens:
-    apply: true
-    sudo: true
-    groups: apache
-  deploy.vogel:
-    apply: true
-    sudo: false
-    groups: 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,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApaR36sYspPVidjeT+Uwg/TThyimznuvE6nAspAQCnvz87bV7tp7gTZXVaLWtG4cS8d3mPZ/fxlN5cGaTpJzU9FT9yNG2c1lozjo8HZ0EePs9+HVXIvCwSZY7TeKIbWzZklRVposxbUirZAhqiWvcXlanFjRGyyoDodZPsrs1Wlje4wAx+sux9uhB2/jUKTAkknIX6/L4Br8Z4z99pi1ofk+dV0rcDat9LmNOvxOuXbmtemENgffhJfBy/SW/KEvChjFjU5OvtVBrSrFCUw5QzDUd56e7u2PW3xkevXu+mwOOpZM/KaobySXsHlJu180FlG+CARnP8oXAI5DMYirp6jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAVAVZGbh8XTLrFsqhNOBkhgBDU+wow7EyOGKTdgqtolPHi]
-
 repo::remi_php56: true
 
 php::settings:
diff --git a/customer/pfizer/development.yaml b/customer/pfizer/development.yaml
index 88666e55..77994c35 100644
--- a/customer/pfizer/development.yaml
+++ b/customer/pfizer/development.yaml
@@ -15,12 +15,16 @@ accounts::users:
   markus.baumann:
     apply: true
     sudo: true
+  romy.pohl:
+    apply: true
+    sudo: true
   willi.martens:
     apply: true
     sudo: true
   deploy.vogel:
     apply: true
     sudo: false
+    group: apache
   jenkins:
     apply: true
     group: apache
@@ -28,6 +32,16 @@ accounts::users:
     apply: true
     sudo: true
 
+# 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,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZjprKA9BDrGcfkKwTe8ygEzAA/iY5FyS3y8Txz6sfMhAOFWogiDLgejAfBQ+eEw3r0s5YzM/lC7wiSDdj52RB/6J5GyHWb3NBjOH4/Yz0ZOClAzCPH+hmuLhbaEZGxxPsbTS1asX3LTKrJKhXpWQniW+7KlW/3M23R9UeJG+NOseexIc05YaoMHNre2fsNO1kd0Yoqpe5e4QpXyS4uhLfY2UHfxqoqOpoq/9kap/DS8Ztyje7z7uebNQmh++gTFyo+eWdki+If/wzp8E46dBl5RN85v4d8YntMOx+gEA372sLGDMkTvlPGvOGDHXu1KucIzAkOPN4m3Kxnkv85+GgjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBjEEpShEGrw6K/IxkIL5JQgBCktXY/CiIR0X6WbV0gw30X]
+
+
 # Add specific sudo rights for CI Deployment
 sudo::configs:
   cmd_alias:
-- 
2.39.5