diff options
| author | root <root@puppet.intra.cacert.org> | 2016-11-05 00:39:41 +0100 |
|---|---|---|
| committer | root <root@puppet.intra.cacert.org> | 2016-11-05 00:39:41 +0100 |
| commit | 1dad9bcf5c2f3212052ce493b08b1a2af754b7f1 (patch) | |
| tree | ae36f3f6a9d4071c58d01f1be106b3f622e063b6 | |
| parent | 2feedef1756f775d23f9a59a5c2461187bb1cfec (diff) | |
| download | cacert-puppet-1dad9bcf5c2f3212052ce493b08b1a2af754b7f1.tar.gz cacert-puppet-1dad9bcf5c2f3212052ce493b08b1a2af754b7f1.tar.xz cacert-puppet-1dad9bcf5c2f3212052ce493b08b1a2af754b7f1.zip | |
Add admin users for puppet and svn
| -rw-r--r-- | hieradata/common.yaml | 10 | ||||
| -rw-r--r-- | hieradata/nodes/puppet.infra.cacert.org.yaml | 2 | ||||
| -rw-r--r-- | hieradata/nodes/svn.infra.cacert.org.yaml | 3 | ||||
| -rw-r--r-- | modules/profiles/manifests/base.pp | 18 |
4 files changed, 29 insertions, 4 deletions
diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 22159a8..b2e666c 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -1,6 +1,12 @@ --- users: - - + jandd: username: jandd - password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbf2hB1CWpWQykHg8SIu1yZVH6aCkPD8E/mMkvcbOW+OsERwTOqvea8TIK0XrzEvcGCBhYt7Angmvu/BIZXgFnotDEYpAbhledqbjkH/yFkYcY1lQrE1q3AvUrpZ9CFof8imhmzqSj7OZZUDQpMEXbXAesBhzXBdpziPSHtcW4LxJoXG3OpFybyiGMVbFVc+y/CzQSqabQPx/JSlDEceSZJLts4mmRqn4/PIbDURbs3mRH74pvVwsNlLGq/CC7/nQ+dA+4c597+/mhxCay0Q+oE5EOrvurdK9er1zw5zJPOadJwuJFXgZ+M0PJEi+WA34skrGzvUByk8URlcLc1nFKTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA0xSzloY3MrzzZtPYIkDyHgCBY0cx39nZdsVb0JmljrI9m2tJAkW3mTxyw69Ju7ctPUQ==] + fullname: Jan Dittberner uid: 1000 + password: ENC[PKCS7,MIIB2gYJKoZIhvcNAQcDoIIByzCCAccCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYmmeAt8w5DMzcB2T84r/s2mikksh1kxVFEG5Nk0o/jOh0BSdtKnEZLYV1SRa2Gvgu6ACqLAqYD+4c9neAnYcQrYL5y9rXC+l61bid3L83wM2XkBJYt534ZlU8XqjEB7R7wyQu+uVXA6PAqy9YccAJmAkDiIHy07yVoG8biG71IoCX7f40Otw28iXLU/N7xoX5ngGrWZaVDkQulwGxFAjD9KDwho9/pPXFEfqdeuJSuL3t3O3PEumvuva+qiZHO8Mb4Ngg8wDgHNFHXLjxohBGQ4e2RgrrcGWwFa+nSFRSukOecFv+WNzBbnNon7hiZ3QiFZoH9ooWIbfghWfZiWAezCBnAYJKoZIhvcNAQcBMB0GCWCGSAFlAwQBKgQQSYlfah+RAoUKmvuQGB79E4BwJDg6EL2YyQ1GWFxz2EYj9cjaVD4AhLUJqsgex5YozliQZCPcflv3VoegHTp2jJ742HbrRDZmE7ZNlsj7BswpOVtE1SO4Xqh4OJTmvLy4V2G2sac/usorrB5LwS+n55Fp/PTBHe3VD0R0Ywv24K6bYg==] + law: + username: law + fullname: Mario Lipinski + uid: 1001 + password: ENC[PKCS7,MIIB2gYJKoZIhvcNAQcDoIIByzCCAccCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc0aZpU2bfVCFwNTbfZfg4VVDqHLB5DNMQjWxwP1FJ/SKUOuApFhOH20nRtZf+KQUo3XnltTqF4Hq+Wt1XclvhzS9UijufQZCGrbWFIJNNEAZ6SVoFKWWRuwmHL34LI0xjidmIFLjM5YeNd3d5+pEU1YQjeS09N58SPySSkDFzUXCgjFMTKzP8nYvTsJ1jpIrXfg7g/gvVJZGXLIQAoDmU2pe1/grPyst5Bc15Rpb2GRKSpl2Cg3qIqv9WQPwNjxHrGKaSpMN/HEaNAUC4cYceUUN3S6/jkPfCtoqBXDyVXHoY7FB7gXpNZiO4ByMF1Uh45zRweH/3nq+69Pk0r4AeDCBnAYJKoZIhvcNAQcBMB0GCWCGSAFlAwQBKgQQ+Avp4L2ueR0dPafRqPGGjIBwW5o3/Zq8DiK4XVzZx/wf4chUu1g3dvJYh/Fn42wv85eBNQrmPFqvj78HybmdStAduY91+dyOPPyux4V0dnco0xr+Ceeym7km9WnWyJgPgC/POjPUQcyUuO58/PyDmVqv+P8RH2rDMSJCSzSRMBFVXg==] diff --git a/hieradata/nodes/puppet.infra.cacert.org.yaml b/hieradata/nodes/puppet.infra.cacert.org.yaml index e9fa990..f7bc115 100644 --- a/hieradata/nodes/puppet.infra.cacert.org.yaml +++ b/hieradata/nodes/puppet.infra.cacert.org.yaml @@ -1,3 +1,5 @@ --- classes: - roles::puppetmaster +admins: + - jandd diff --git a/hieradata/nodes/svn.infra.cacert.org.yaml b/hieradata/nodes/svn.infra.cacert.org.yaml index af5d8b9..760c36b 100644 --- a/hieradata/nodes/svn.infra.cacert.org.yaml +++ b/hieradata/nodes/svn.infra.cacert.org.yaml @@ -1,3 +1,6 @@ --- classes: - roles::svnserver +admins: + - jandd + - law diff --git a/modules/profiles/manifests/base.pp b/modules/profiles/manifests/base.pp index cede5d2..044fbdd 100644 --- a/modules/profiles/manifests/base.pp +++ b/modules/profiles/manifests/base.pp @@ -1,7 +1,21 @@ class profiles::base ( ) { # ensure admin users for this container - $admins = hiera('users') + $admins = hiera('admins') - notice { $admins: } + $admins.each |String $username| { + notice("Admin user ${username}") + $user = hiera('users')[$username] + group { $user['username']: + ensure => present, + } -> + user { $user['username']: + ensure => present, + comment => $user['fullname'], + gid => $user['username'], + groups => ['sudo', 'adm'], + password => $user['password'], + uid => $user['uid'], + } + } } |