auser-poolparty 0.2.59 → 0.2.60
Sign up to get free protection for your applications and to get access to all the features.
@@ -1,20 +1,16 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
|
3
3
|
. /etc/profile
|
4
|
-
|
5
|
-
if [ `/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master` ];
|
4
|
+
if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master) ];
|
6
5
|
then
|
7
6
|
echo '';
|
8
7
|
else
|
9
|
-
ps aux | grep puppetmaster | awk '{print $2}' | xargs kill
|
10
|
-
/
|
11
|
-
rm -rf /etc/puppet/ssl
|
12
|
-
/etc/init.d/puppetmaster start
|
13
|
-
if [ `/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master` ];
|
8
|
+
ps aux | grep puppetmaster | awk '{print $2}' | xargs kill; /etc/init.d/puppetmaster stop; rm -rf /etc/puppet/ssl; /etc/init.d/puppetmaster start
|
9
|
+
if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master) ];
|
14
10
|
then
|
15
11
|
echo '';
|
16
12
|
else
|
17
13
|
# Try again
|
18
|
-
/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master
|
14
|
+
/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master 2>&1
|
19
15
|
fi
|
20
16
|
fi
|
@@ -2,11 +2,11 @@
|
|
2
2
|
|
3
3
|
. /etc/profile
|
4
4
|
# rm -rf /etc/puppet/ssl
|
5
|
-
if [
|
5
|
+
if [ $(hostname) -eq "master"];
|
6
6
|
then
|
7
7
|
/bin/sh puppetrerun
|
8
8
|
else
|
9
|
-
if [
|
9
|
+
if [ $(/usr/sbin/puppetd --onetime --no-daemonize --logdest syslog --server master) ];
|
10
10
|
then
|
11
11
|
echo '';
|
12
12
|
else
|
data/lib/poolparty/version.rb
CHANGED
data/poolparty.gemspec
CHANGED