From a6b5e7f29548edcc636b1710f6817775ab1c0592 Mon Sep 17 00:00:00 2001
From: Thomas Heller <thomas.heller@pixelpark.com>
Date: Tue, 14 Nov 2017 12:23:14 +0100
Subject: [PATCH] added new user to cmn.yml and project

---
 common.yaml                    | 35 ++++++++++++++++++----------------
 customer/basf/development.yaml |  3 +++
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/common.yaml b/common.yaml
index 9db43ef9..3dbe6553 100644
--- a/common.yaml
+++ b/common.yaml
@@ -74,14 +74,14 @@ infra::profile::logrotate::rules:
 # Account definitions
 
 accounts::users:
-  philipp.dallig:
-    apply: true
-    uid: 25036
-    key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQCqhn1RXk6oL7T3agM6MAf8b3KVP85IdrAmcj4UhApcb7RinextoujbcdndTiifen4HJFZDZyJPENOHbxXtBp40LUCaMZglmY8QwOA+gh/DKjrYwfeFmKL9lJmZ5cJNd5r8Ms3el0eaILWOLhcivy2qXlT4uXnnhHLNLFQIc8zGoEARuoF9ueGk4waa6MF/YZAz8MaOoPderOyGoKD0dX6LYAX/fsXH+1h/0S/S0mRPWSRJP9y7yBU+Q3s/c0E0ElXcy96ZtYdHSguB9Jf4DGlr7CnMd4NKlzz2L1h8ngRqBhafJp1k8C15M7Yr7s6lop8pWsRz3H9THyC4bXu8wXCJ"
-    comment: "Philipp-Dallig"
-    sudo: true
-    shell: "bash"
-    overwrite_config: true
+#  philipp.dallig:
+#    apply: true
+#    uid: 25036
+#    key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQCqhn1RXk6oL7T3agM6MAf8b3KVP85IdrAmcj4UhApcb7RinextoujbcdndTiifen4HJFZDZyJPENOHbxXtBp40LUCaMZglmY8QwOA+gh/DKjrYwfeFmKL9lJmZ5cJNd5r8Ms3el0eaILWOLhcivy2qXlT4uXnnhHLNLFQIc8zGoEARuoF9ueGk4waa6MF/YZAz8MaOoPderOyGoKD0dX6LYAX/fsXH+1h/0S/S0mRPWSRJP9y7yBU+Q3s/c0E0ElXcy96ZtYdHSguB9Jf4DGlr7CnMd4NKlzz2L1h8ngRqBhafJp1k8C15M7Yr7s6lop8pWsRz3H9THyC4bXu8wXCJ"
+#    comment: "Philipp-Dallig"
+#    sudo: true
+#    shell: "bash"
+#    overwrite_config: true
   oliver.boettcher:
     apply: true
     uid: 24555
@@ -202,14 +202,8 @@ accounts::users:
     apply: false
     shell: "bash"
     sudo: true
-#  stefan.teschke:
-#    uid: 66872
-#    key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC42zbPUN+oNWD4mIA5jH6F2aJmx0YPbO9Io24QeW38kHY/zIQRevoadfdu9foDt/VKEJ84dLLvPDI9J7zD7gTqo/YfjrNGars0G6+gmuzIoGBiWzxP6aWdh0TXhcxdpucIGFJNXSFjXCzdBthTh2GA0MzeLS0P6xc5qQdNoAvbiOcW0lbz64diP5aNsidV14kZWXnD2w+Ddl2JkW2QPKCqA0b6O6z7TfCYKgxgcnbsWliHPQmfwuMJxaoppFgDK0HnzUvVMGfPG1ALJXgQBSCw/7OjddKNc+hicWZKvh5dRRRR7zv+BrnXc2CMFtMd6WhnLn5CKgeHWa3uysFugjFz1Fsu+wFOhnCTiSW8X6lO1FKTvUZnEi4iJ4wepfcjHcgoiq7yHA6HMrevVywvRHQgvVi6xb7g7wMFjTYjTrl+cw+2NUeYANaMWoZT+E2UNnmCuT9r7oKfASk6eL3y6apip92Izy8hXifC2lpWS3jF73IrLdRENjjlfjddcHxkWXoHskCJfqKdsnRba1Bm6bMKEyujfeSaLrj6HRL5lzPM9Mt9ScUVNYOiuhuKAzkY8t8r+27lxfwC1NTlxUowzTlUohqqj51bEZQnZ8ijTY8+E3E1Fj5Ovjqb8rPTX5C4kuHx2mC53MksAZkWKoutjcWSgJm872gKRkNPdEhjBV9GRQ==
-#    comment: "Stefan Teschke"
-#    apply: true
-#    shell: "bash"
-#    sudo: true
-    # Entwickler Berlin
+
+# Entwickler Berlin
   m_scholze:
     uid: 9531
     key: "AAAAB3NzaC1yc2EAAAABIwAAAQEAzF71kcxQxWygLqP/0m1F1JDoW9VAGeWVI4i3tBTya4/cMsgnyi6BBhznssV97cQoVF/HErjky2NxiSKiy4ACMpy4LbgO/vJyyYac0pmnYXbAF89/yrpwXzCOBJQOO5aVfy7wJtDLaGosszxjUEbuSGHFORScLiKOx9S7yZ8dEvPJyLeY2omr61Cf5j5KOr0p/jj7EJveKzuoHH7QUdsax8fs+erz+efF2S3aC9knLoxKEc6NanYajr8hMhVeXkeqkqO1JrrxVA2tLPwqXzsG6ku+hiO8FpHR4ZBL1VRwdwC9UHHM18WzwnPB+vqk6drZ5ts+s7A95pJH/TataAPFZQ=="
@@ -538,6 +532,11 @@ accounts::users:
     uid: 24653
     key: "AAAAB3NzaC1yc2EAAAABIwAAAQEAmtUbtz6Q6lE4iaT2uuWohocaN+//5vAoAPiNV6MBH1CLvlXgjU1GmKJCYVqCT0xOWWP4ZS9BrruYzbbo+X2jDTY6BmUyN8qEtLvRpzQybjQEmu9Za79aBjQg0GHXprxvKBUIwqAtlCOInUwrewfomgzFSuOABsyL3wnl5VCOf0dtxYiFjtQQhBWPwBSpX3wu/iFh0icpaKsti9n63TalLY7D8L3nCzXewx1nEmDnb1hR3xxDnumCfrq3Ulc2zZP6spCa6O/+ku2Jb9x1IR5RZAjLs+mDOKL31V3fX4tyh637X8G/L2LJ+GcNu/iQXFMvg+kC5RQddNQPI6XSVA8wTQ=="
     comment: "Thomas-Voelkel"
+  thomas.hermel:
+    uid: 24008
+    key: "AAAAB3NzaC1yc2EAAAABIwAAAQEAq4V/o1XRoqhwooqJysiTmuvti5dlbklCrfcqnBlY8/Dc63CQq8TL0MvUVdHSRonPQWn47UFJywN3qaji1LPtw9+r3jYEqOi81T72myZBFSLh9ncwNUK5zsFvD1W+dafoz7RLs3sePBHUzaE+K32/SiwEJxa0Om8iKl+l7L9znIuGwrU+ofWDC3uxj6zZMFkREAL8HOjywZMplhmVpBgt5ZaUKlaKAHxf5y4noQX7idDCuCL3TBJBt8Ik2a4w36WS4AQjc804EgxMMccA3VKys9oZSmsmQxux2IFjt6V9qv4+TR4MgfA61Kcl2roa7jiarZvTbk1dtyccLDyWF1JhWQ=="
+    comment: "Thomas-Hermel"
+
   # Bielefeld
   carsten.hensiek:
     uid: 24825
@@ -1075,6 +1074,10 @@ accounts::users:
     uid: 66872
     comment: "Stefan Teschke"
     apply: false
+  philipp.dallig:
+    uid: 25036
+    comment: "Philipp Dallig"
+    apply: false
 
   # Service-User
   opsadmin:
diff --git a/customer/basf/development.yaml b/customer/basf/development.yaml
index 6800549e..428f614a 100644
--- a/customer/basf/development.yaml
+++ b/customer/basf/development.yaml
@@ -6,6 +6,9 @@ accounts::users:
   daniel.kurre:
     apply: true
     sudo: true
+  thomas.hermel:
+    apply: true
+    sudo: true
 #
 # infra::additional_classes:
 #  - apache::mod::headers
-- 
2.39.5