summaryrefslogtreecommitdiff
path: root/hieradata
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2020-06-21 16:08:12 +0200
committerJan Dittberner <jandd@cacert.org>2020-06-21 16:18:01 +0200
commit91cbd1922c4661cfb8a1badad2ffe28849d0ffea (patch)
treef48ae9e0b8942d8f42da10ca87af3f7747b75ca0 /hieradata
parent787cf90126543988554191c43391f2ac496c6124 (diff)
downloadcacert-puppet-91cbd1922c4661cfb8a1badad2ffe28849d0ffea.tar.gz
cacert-puppet-91cbd1922c4661cfb8a1badad2ffe28849d0ffea.tar.xz
cacert-puppet-91cbd1922c4661cfb8a1badad2ffe28849d0ffea.zip
Replace custom Python webhook with packaged webhook
This commit replaces the custom Python webhook for puppet environment deployment with the go based webhook from the Debian package with the same name. The puppet-deploy script only takes care of pulling from git and running r10k now. The web requests are now handled by webhook.
Diffstat (limited to 'hieradata')
-rw-r--r--hieradata/nodes/puppet.yaml10
1 files changed, 8 insertions, 2 deletions
diff --git a/hieradata/nodes/puppet.yaml b/hieradata/nodes/puppet.yaml
index 502574b..e8b6047 100644
--- a/hieradata/nodes/puppet.yaml
+++ b/hieradata/nodes/puppet.yaml
@@ -3,6 +3,12 @@ classes:
- roles::puppetmaster
profiles::base::admins:
- jandd
+profiles::puppet_server::git_pull_branches:
+ - master
+ - training
+profiles::puppet_server::git_pull_directories:
+ master: /etc/puppetlabs/code/environments/production
+ training: /etc/puppetlabs/code/environments/training
profiles::puppet_server::git_pull_ssh_passphrase: >
ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEw
DQYJKoZIhvcNAQEBBQAEggEAhbUQYK6aL9A43CJJoXTpgpEvKny739PCf4pQ
@@ -14,8 +20,8 @@ profiles::puppet_server::git_pull_ssh_passphrase: >
0MlwuDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDX/ycL+PdDfsZ4QGIz
72sBgDCNDoJmkzzjSfLIvN/Q2D0p2XBtKWrc7NkmVzZrzVZ6cLJCBornuJ72
fOJnmPqpFng=]
-profiles::puppet_server::git_pull_tokens:
- - ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWLS320bvmv2NSEtEFn5dFD5goJ2g3T2JDT8EylyZ5WDMdlW3w8kx4cQSju1TvjrUIRimkYMKIi9Ej2cXUEMZZoWXpdTbxBreBY5NNlzz0UWmzuwgx6qVy3Czlvhbqq2vb97W1/e30sKcaXe4Mly9UWy+pslH3KHEs4vwipZ+MaIlY76HOPVUmQBtNwaaIiY2KtBTfVGXGUp5VXYGQZsUL2K6DucT+xP3duYjK5iCPfk+w/iYz1bv3m2uT5GvsahZhCBGJNu81ZZ9MY4+WZfKwqfEN2fQz1X6mqBvpaXqE3w573SZo6K7ofhiK8q6+4QlNJ6qlLrsuetlgu8+aHYhcDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDoG8fxzhnn0Xp4Bk+Yg4RsgDDTTKABVrszTg2gZ1bZPm0ysvpoG6tSE0FVmexQjR814RSl81f7coXap/pnWwAhpPo=]
+profiles::puppet_server::git_pull_token: >
+ ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWLS320bvmv2NSEtEFn5dFD5goJ2g3T2JDT8EylyZ5WDMdlW3w8kx4cQSju1TvjrUIRimkYMKIi9Ej2cXUEMZZoWXpdTbxBreBY5NNlzz0UWmzuwgx6qVy3Czlvhbqq2vb97W1/e30sKcaXe4Mly9UWy+pslH3KHEs4vwipZ+MaIlY76HOPVUmQBtNwaaIiY2KtBTfVGXGUp5VXYGQZsUL2K6DucT+xP3duYjK5iCPfk+w/iYz1bv3m2uT5GvsahZhCBGJNu81ZZ9MY4+WZfKwqfEN2fQz1X6mqBvpaXqE3w573SZo6K7ofhiK8q6+4QlNJ6qlLrsuetlgu8+aHYhcDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDoG8fxzhnn0Xp4Bk+Yg4RsgDDTTKABVrszTg2gZ1bZPm0ysvpoG6tSE0FVmexQjR814RSl81f7coXap/pnWwAhpPo=]
profiles::icinga2_agent::pki_ticket: >
ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEw
DQYJKoZIhvcNAQEBBQAEggEAdehEizEK2eAr85FD4XwS8dzDiIqKV2vanCjn