diff options
| -rwxr-xr-x | share/hydractl/puppet-initialize | 4 | ||||
| -rwxr-xr-x | share/hydractl/puppet-reset-master | 29 |
2 files changed, 24 insertions, 9 deletions
diff --git a/share/hydractl/puppet-initialize b/share/hydractl/puppet-initialize index 3833e96..26b0165 100755 --- a/share/hydractl/puppet-initialize +++ b/share/hydractl/puppet-initialize @@ -16,5 +16,5 @@ # License along with this program. If not, see # <http://www.gnu.org/licenses/>. -puppet agent --server puppet.`facter domain` --pluginsync true --waitforcert 60 --digest-sha1 --test \ - --ca_port 8141 --vardir /var/lib/puppet --ssldir /var/lib/puppet/ssl $* +puppet agent --server puppet.`facter domain` --pluginsync true --waitforcert 60 --test \ + --vardir /var/lib/puppet --ssldir /var/lib/puppet/ssl $* diff --git a/share/hydractl/puppet-reset-master b/share/hydractl/puppet-reset-master index a1e0e5e..77f5e84 100755 --- a/share/hydractl/puppet-reset-master +++ b/share/hydractl/puppet-reset-master @@ -16,21 +16,36 @@ # License along with this program. If not, see # <http://www.gnu.org/licenses/>. -# Stop services +# Stop agent /etc/init.d/puppet stop -/etc/init.d/puppetmaster stop -/etc/init.d/nginx stop + +# Stop master +if [ -e "/etc/init.d/puppetmaster" ]; then + /etc/init.d/puppetmaster stop + /etc/init.d/nginx stop +else + /etc/init.d/apache2 stop +fi # Reset configuration hydractl puppet-reset-stored rm -rf /var/lib/puppetmaster/ssl +# Generate new certificate +# See http://blkperl.github.io/replace-puppet-ca.html +puppet cert --generate puppet.`facter domain` +hydractl puppet-finger + # Get fresh config rm -rf /etc/puppet/ && git clone /var/git/repositories/puppet.git/ /etc/puppet ( cd /etc/puppet/ && git submodule update --init ) chown -R puppet.puppet /etc/puppet/ -# Start services -/etc/init.d/puppetmaster start -sleep 5 -/etc/init.d/nginx start +# Start master +if [ -e "/etc/init.d/puppetmaster" ]; then + /etc/init.d/puppetmaster start + sleep 5 + /etc/init.d/nginx start +else + /etc/init.d/apache2 start +fi |