summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG4
-rw-r--r--conf/redhat/client.init10
-rw-r--r--conf/redhat/server.init10
3 files changed, 21 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e88e20269..5214d6462 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
0.24.5
- Added message referencing ReductveLabs build library
+ Fixed #1368 - updated Red Hat init scripts
+
+ Added message referencing ReductiveLabs build library
Fixed #1396 - Added sha1 function from DavidS to core
diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index b77bd017a..c3cb91e90 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -62,6 +62,11 @@ restart() {
start
}
+genconfig() {
+ echo -n $"Generate configuration puppet: "
+ $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
+}
+
case "$1" in
start)
start
@@ -86,8 +91,11 @@ case "$1" in
shift
$puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
;;
+ genconfig)
+ genconfig
+ ;;
*)
- echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
+ echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
exit 1
esac
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index b64622140..8266977de 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -62,6 +62,11 @@ restart() {
start
}
+genconfig() {
+ echo -n $"Generate configuration puppetmaster: "
+ $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
+}
+
case "$1" in
start)
start
@@ -79,8 +84,11 @@ case "$1" in
status $PUPPETMASTER
RETVAL=$?
;;
+ genconfig)
+ genconfig
+ ;;
*)
- echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
+ echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}"
exit 1
esac