pfizer - changed yaml config + added user c.baer

diff --git a/common.yaml b/common.yaml
index 0d803eb3ca4fbd78fb99b28ca87f5d2239dac882..9773d8de62d966ebd87da908e25e8bb2f73bdd07 100644 (file)
--- a/common.yaml
+++ b/common.yaml
@@ -454,7 +454,7 @@ accounts::users:
   bmwi.delivery:
     uid: 24789
     keys:
-      www-key1: 
+      www-key1:
         key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDyIJ/zUYr6PsSo2KMhbGYGnOKxZnYGVQIqasA6AR5TPeno2j31Y5vwNAb0kMebvVssH8bmdhDig7N8Sd7Yl6EY0pERmCOJoDHISVhBITVAEuADgrCl7DOEZVnpcCftAFv8kVGZBQmhBA6COgJFjLxlZtf2Bqz1lGmQziDXS4aauN5D4dO7yTaf/+deWhWRatJT38eTGrctkVmTh3Idm8nnTco7XCWv5rHlwGmc7/AL2oeEZw4i9+UjDFZxbB83P0WAHYsJ0xwcsvnxsuA37JBMKo+w7r8pG594LzeotL52luv4lIWGBQi26EfP4jtFwESeFtwoYKeH4jUg0KYcgwdb"
       red-key2:
         key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDBmKvAKV7/fLEu6+UJ5Br67Em9RlJHzLGn0YYDw/suebFvjR1wVx9Er6a1trbzJHlymGYEUIXhpEAYKG+C7yu5W+4cjSnNAR03cUSbeLpwGM43taRXFajA0yNIYtnVKE70N75a3NVLn709CH6b1vLW+lmLTpoZxKyxHiQ4KFm5dFm33FJi7PtcH0E4q67+3D0i9VnCm9KiwBnFgt35B/dXbDqkH1JcfupBh81q8lo2RRmLv2Ke7x0C4QVHQq5Mpnh+Cnsakzau9f92lcMP5onojKeb2NJmmy+Si5CcXH0WEXPK2JPs6+4CGu7L18VRUGLC4fhGMpYVwif+11D+z7kT"
@@ -479,6 +479,12 @@ accounts::users:
     uid: 66674
     key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQC7W9vqMPZ1tRkVlzBDg7DfuC66DJJppv1m1Nzr/jUeXIprSt/8RN+D+lVqSVxl+vOxX00oQQxabmSP8RLl7HTrCx4obAVWlHCX3ChOS/PGK9YULfh1YzBtvVvneD8wyyY1gBVClJNto6++MDR+MhZZ0IGQDHtZlaAKWzJDlWqCU7sfch6agsxWCgSMlI8gA0JGiBemASo7cHFRNEo3sZNuko794zDnYiKp4tPJPrJqw6GAlBQnEim3D6n/YV5SR3JdRyGPj0TNBJjNYNQ8AjHaIo1Izzf5J6TnwFH75UCpILHiGP/AiRyjxOp7IWEt0igGHRj4b3xSQTd+Cpn/I9CJ"
     comment: "Santiago-Nuneznegrillo"
+  christian.baer:
+    uid: 66787
+    key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDa8i8j1KnzGJ4sFzBuLEi5sKbrvHfuSfF1sLBsCMe1XYA/rhevUNVnnLBK+RYrEqljN8wfooibCdAjMMlBmzxkjKTbUB1FqmO4qn7YCSokcYTpE1p/CHig/ZCG7YNuuI+7+Zsn0CV9jdoYl6Cm9+XS/NPmUcLFTlp+FhFNTvWKM9pe8NJ4YvaarcruXQs+j6vBNsJ5TNV5qIrAsVEUwC28TQuGbzV66YdyLIji1xc4sf1uqv2Hr0qO+NczlMvxo6MM7DdmUw8XqZRNA+DdS6bg6d35ucbkjycO0T6bXw44r2vu6g+fYHwbhqR6d/J6kX1OGSfrnGrysgIZQCMc7AG3"
+    comment: "Christian-Baer"
+    shell: "bash"
+
 # Support und andere Externe
   hastexo:
     uid: 1000

diff --git a/customer/pfizer/production.yaml b/customer/pfizer/production.yaml
index ea58cd87578af5dcf49b9b90b7426d707119ecb1..b25d975073f50b8315a26c1bb76e74e2ca6221ec 100644 (file)
--- a/customer/pfizer/production.yaml
+++ b/customer/pfizer/production.yaml
@@ -3,15 +3,29 @@ kunde: "pfizer"
 accounts::users:
   thomas.bussmeyer:
     apply: true
+    sudo: false
+    groups: apache
   deploy.vogel:
     apply: true
     sudo: false
+    groups: apache
   nikolai.potapov:
     apply: true
     sudo: false
+    groups: apache
   andreas.pinto-koehler:
     apply: true
     sudo: false
+    groups: apache
   stephan.vits:
     apply: true
     sudo: false
+    groups: apache
+  service.typo3:
+    apply: true
+    sudo: false
+    groups: apache
+  christian.baer:
+    apply: true
+    sudo: false
+    groups: apache

diff --git a/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml
index e258cd4b97bd578dc5fb725924b05155feaf864d..ea8296e0316f29f13ee0d9f511649180ea1766a7 100644 (file)
--- a/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml
+++ b/customer/pfizer/web01-pfizer-de.pixelpark.net.yaml
@@ -10,32 +10,6 @@ site::additional_classes:
 apache::mpm_module: worker
 apache::default_vhost: false
 
-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
-  service.typo3:
-    apply: true
-    sudo: false
-    groups: apache
-
 # TODO: Abwarten auf Ticket: https://jira.pixelpark.com/jira/browse/PPPUPPET-202
 #  csv_upload:
 #    uid: 25113
@@ -1364,4 +1338,3 @@ logstash::generic_resource:
       tags:
         - "%{customer}"
         - "%{tier}"
-

diff --git a/customer/pfizer/web02-pfizer-de.pixelpark.net.yaml b/customer/pfizer/web02-pfizer-de.pixelpark.net.yaml
index 19fe4c7e28d9016ad33f340e4a73a8e23ebde26a..5d7d4c898ef7b02d8326be8a444fcdf8e91a244e 100644 (file)
--- a/customer/pfizer/web02-pfizer-de.pixelpark.net.yaml
+++ b/customer/pfizer/web02-pfizer-de.pixelpark.net.yaml
@@ -5,32 +5,7 @@ site::additional_classes:
   - site::profile::typo3
   - site::profile::mysql_server
   - logstash
-
-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: true
-    groups: apache
-  deploy.vogel:
-    apply: true
-    sudo: false
-    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
@@ -39,13 +14,6 @@ accounts::users:
 #    sudo: false
 #    group: sftpgroup
 #    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAE5C4nE51Xi3Z1l7fHWvkplz1XBcyk4Z9AmtsfiW+9PcpJEsMxtUcrRHul77qjRifruPpbfOSFvab2xBG+7Bn+2WIcOyeFFid7lWOvdli40WFsgcU+BOPUuE4N5hojaSQeZq2Xwa+kqfhSURtQ8jWC6fBFgDMAFmO7Gz6lrEg3wICnG1R13rToqCO6IrBA849FQsf3E2gDP5TmRMSblD7Fn2oz66ZLvCVEJslhxwFnoGw5BBRJ0ot9k8Dv5Z1VAX5YffjexwjSpmsR5syRUwgf1ouvhbUxF0nPwkp3asVMzdxujYDQF0Xm0mE39viZ5qiU9/cTzQGhxR4FaSuaFRaEDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAShSOzRBbGrZj9lXO5CWefgBCLOdtMRowibswx2J96tr6X]
-  christian.baer:
-    uid: 60168
-    key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDa8i8j1KnzGJ4sFzBuLEi5sKbrvHfuSfF1sLBsCMe1XYA/rhevUNVnnLBK+RYrEqljN8wfooibCdAjMMlBmzxkjKTbUB1FqmO4qn7YCSokcYTpE1p/CHig/ZCG7YNuuI+7+Zsn0CV9jdoYl6Cm9+XS/NPmUcLFTlp+FhFNTvWKM9pe8NJ4YvaarcruXQs+j6vBNsJ5TNV5qIrAsVEUwC28TQuGbzV66YdyLIji1xc4sf1uqv2Hr0qO+NczlMvxo6MM7DdmUw8XqZRNA+DdS6bg6d35ucbkjycO0T6bXw44r2vu6g+fYHwbhqR6d/J6kX1OGSfrnGrysgIZQCMc7AG3"
-    ssh_type: "ssh-rsa"
-    comment: "Christian Baer"
-    sudo: true
-    apply: true
 
 repo::remi_php56: true