diff options
| author | mail_redacted_for_web | 2015-10-26 15:50:22 -0700 |
|---|---|---|
| committer | mail_redacted_for_web | 2015-10-26 15:50:22 -0700 |
| commit | 4598483d0f7faf357c443e12816a45cd0f975e50 (patch) | |
| tree | d5a9ce5cad5ce85f30f2174074b9e4993366d852 /site | |
| parent | 1cb89d981a7845453529a3a86ac9a9b1254fe61f (diff) | |
| download | control-repo-template-4598483d0f7faf357c443e12816a45cd0f975e50.tar.bz2 | |
Fix the update-classes script and set appropriate perms on it
Diffstat (limited to 'site')
| -rw-r--r-- | site/profile/files/puppetmaster/update-classes.sh | 2 | ||||
| -rw-r--r-- | site/profile/manifests/puppetmaster.pp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/site/profile/files/puppetmaster/update-classes.sh b/site/profile/files/puppetmaster/update-classes.sh index dea10a9..fc33026 100644 --- a/site/profile/files/puppetmaster/update-classes.sh +++ b/site/profile/files/puppetmaster/update-classes.sh @@ -6,6 +6,6 @@ CERT=$(puppet master --confdir ${CONFDIR} --configprint hostcert) CACERT=$(puppet master --confdir ${CONFDIR} --configprint localcacert) PRVKEY=$(puppet master --confdir ${CONFDIR} --configprint hostprivkey) OPTIONS="--cert ${CERT} --cacert ${CACERT} --key ${PRVKEY}" -CONSOLE=$(awk '/server =/{print $NF}' ${CONFDIR}/console.conf) +CONSOLE=$(awk '/server: /{print $NF}' ${CONFDIR}/classifier.yaml) curl -k -X POST ${OPTIONS} "https://${CONSOLE}:4433/classifier-api/v1/update-classes" diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp index ec85155..193f0ca 100644 --- a/site/profile/manifests/puppetmaster.pp +++ b/site/profile/manifests/puppetmaster.pp @@ -53,6 +53,7 @@ class profile::puppetmaster { file { '/usr/local/bin/update-classes.sh' : ensure => file, source => 'puppet:///modules/profile/puppetmaster/update-classes.sh', + mode => '755', } #https://docs.puppetlabs.com/puppet/latest/reference/config_file_environment.html#environmenttimeout |