From 05fc9055717f0ceeb37a0d022792678416ad8966 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 27 Sep 2011 20:46:49 -0300
Subject: Adding puppet-reset-master and renaming puppet-reset

---
 share/hydractl/puppet-reset        | 10 ----------
 share/hydractl/puppet-reset-agent  | 10 ++++++++++
 share/hydractl/puppet-reset-master | 23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 10 deletions(-)
 delete mode 100755 share/hydractl/puppet-reset
 create mode 100755 share/hydractl/puppet-reset-agent
 create mode 100755 share/hydractl/puppet-reset-master

diff --git a/share/hydractl/puppet-reset b/share/hydractl/puppet-reset
deleted file mode 100755
index d009c02..0000000
--- a/share/hydractl/puppet-reset
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-#
-# Reset puppet SSL setup and register again.
-#
-# TODO: remove whole /var/lib/puppet?
-#
-
-/etc/init.d/puppet stop
-rm -rf /var/lib/puppet/ssl
-puppetd --server puppet.`facter domain` --waitforcert 60 --test --ca_port 8141
diff --git a/share/hydractl/puppet-reset-agent b/share/hydractl/puppet-reset-agent
new file mode 100755
index 0000000..d009c02
--- /dev/null
+++ b/share/hydractl/puppet-reset-agent
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Reset puppet SSL setup and register again.
+#
+# TODO: remove whole /var/lib/puppet?
+#
+
+/etc/init.d/puppet stop
+rm -rf /var/lib/puppet/ssl
+puppetd --server puppet.`facter domain` --waitforcert 60 --test --ca_port 8141
diff --git a/share/hydractl/puppet-reset-master b/share/hydractl/puppet-reset-master
new file mode 100755
index 0000000..ee1c888
--- /dev/null
+++ b/share/hydractl/puppet-reset-master
@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Reset puppet master and start over again.
+#
+
+# Stop services  
+/etc/init.d/puppet stop
+/etc/init.d/puppetmaster stop
+/etc/init.d/nginx stop
+
+# Reset configuration
+hydractl puppet-reset-stored
+rm -rf /var/lib/puppetmaster/ssl
+
+# 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 10
+/etc/init.d/nginx start
-- 
cgit v1.2.3