Fix the update-classes script and set appropriate perms on it

npwalker · npwalker · commit 4598483d0f7f · 2015-10-26T15:50:22.000-07:00
diff --git 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
@@ -53,6 +53,7 @@
   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

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@`
`53`	`53`	`file { '/usr/local/bin/update-classes.sh' :`
`54`	`54`	`ensure => file,`
`55`	`55`	`source => 'puppet:///modules/profile/puppetmaster/update-classes.sh',`
	`56`	`+ mode => '755',`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`#https://docs.puppetlabs.com/puppet/latest/reference/config_file_environment.html#environmenttimeout`