]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'master' of
authorhakcosar1 <hakan.cosar@publicispixelpark.de>
Sat, 5 Aug 2017 03:58:55 +0000 (05:58 +0200)
committerhakcosar1 <hakan.cosar@publicispixelpark.de>
Sat, 5 Aug 2017 03:58:55 +0000 (05:58 +0200)
https://hakcosar1@git.pixelpark.com/puppet/hiera.git

Conflicts:
common.yaml

1  2 
common.yaml

diff --cc common.yaml
index bbf4bb196986cb76ab3823930aa260cf98e5322e,331fb1b4faa0d0f362003444697f4a19ea7f7c23..113d4cb3a18592b5a1318dd33bb411a5b2cac8a8
@@@ -902,12 -931,11 +931,19 @@@ accounts::users
      uid: 60302
      key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDSaqPvCeqa7vsxVL+Prdli3lCyK52an8JWwYID67TdLZJkVyMud9xuXMzzGdJ3v6hbf9LF/kCQufkfZP7hL9vXmBKUixImjh/SLRuOTDJBWYOn58mCMnPMEHv+G3PVYNcmq07v/GoiOa5K2ZuhH5+/NXcTnh0q+Ugv8/1OQEQ227Rn/sjaMLTFBdO78Q55ev0htx7Nhtjz7rQk1w1zehKzRUDkudpye5hRB7R/F8QSE3/UvyBrUdY8Vso/LPdzOd5sNjeIfzEKB4HviewjsccTCRXAZyOuBgbkeNN4sv18JiU1YABhFXquGRZncERZiMg65lLjwaow6gBDxC+cyo0z"
      comment: "Bernd Czogalla - Sparkasse"
++
 +  # only siemens environment
 +  pubadmin:
 +    uid: 501
 +    key: "AAAAB3NzaC1kc3MAAACBAJbukh5BWArEguVhGW1caEB5FMtjzTH18fuHwxMEeHCj78HhVUp7bUj8h6OI6+iPHnKd50NZtKyF+cU3eYhHzx6XzaHSSknGXp/3V5vDAC2TvY5L7LUhkGnzn9cJR65yuBQ9wc2PokLriPNkjopck96V7Om6TJDp7Ymm+xQlXY/nAAAAFQCezs08Wlw/R2EnZPoMRLsmodAy+QAAAIABk26MGm0Pc6stpx5oLgT2c1s8YUBA9ZmbDtpLvdSVR1L+SihbZRhRXJ/BpTHCfy/J4h2Vk5kxKHkUkGP5l/T8FyTcAGDQ7ZSSiIMZtim2NR90INo1OUGDG/a0r0wzWHMnujmI/33mnXSCm2sS0eYlbaPC59AfvnlKVPPNyTP6sgAAAIBVobzLbZqZwWlKY98Xne3My8anYxkHF7uf51CIenOEiNl5/cGhajZAaJq/UNNWGCmYogOd2yf59sOrI+CymKyxkxzYCWN1810f4ngcb0syFZk3g2S2X924YSG02WEPPz+5NF5qYOIbTx7rLQCBJ3OXJOCzeDj7QTDsZcrjqRspkQ=="
 +    comment: "pubadmin - Siemens"
 +
+   christian.meckelmann:
+     uid: 60303
+     key: "AAAAB3NzaC1yc2EAAAABJQAAAQEAh6ags67q7Jy/uMGn1SG6gRRJbZCCIta1TQkKc4vYoq4KHu/EWw94iABKEaPN25+PczWC6yHTHi9UgC53bZNaJ5MtAhSkPfvt6qyzE0NEH5lT0dG9ur73KK/0Z3w2ACHlgZN1LF3MqweI1vF4xKe372LIUOnJpzJVK6xfV3R6Nl1yi+2emDxE/dh/jCsFfU+kPLR/0WhM9uTB7CwxUc4nCPrnBD2b87qV5p2BJPubKGuChbDEMpl3OycCxYbbYrzZdLAhIImi03kR/a1mw0vx41eINetIGxb8LrkDxV9CTNbqMqbuUgtHiWK2ngnbIhAis/DCt8WM5f7GPTLju7E6Jw=="
+     comment: "Christian Meckelmann - Sparkasse"
++
    # ausgeschiedene Mitarbeiter
    nils.wagner:
      apply: false