Updating puppet-{initialize,reset-master}

diff --git a/share/hydractl/puppet-initialize b/share/hydractl/puppet-initialize
index 3833e96ba6ef3bc5f9d1dcef16b6b592ef60047a..26b01656a283579de5e54a74630e4627412ac3a9 100755 (executable)
--- 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 a1e0e5e7d9cbca58fed4ec5a1f2b785548c6216f..77f5e84a0f66af536ae3e26fdcee8a259d220683 100755 (executable)
--- 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