Merge pull request #108 from sjoeboo/revert-106-umask

Revert "Allow setting of the umask for the consul daemon."
voxpupuli · Apr 14, 2015 · 0bbbea6 · 0bbbea6
2 parents e500563 + 99d5546
commit 0bbbea6
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 7 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -63,7 +63,6 @@
   $watches           = {},
   $checks            = {},
   $acls              = {},
-  $umask             = '0022',
 ) inherits consul::params {
 
   validate_bool($purge_config_dir)

diff --git a/templates/consul.debian.erb b/templates/consul.debian.erb
@@ -56,7 +56,7 @@ do_start()
     mkrundir
     start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid $USER --background --make-pidfile --test > /dev/null \
         || return 1
-    start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid $USER --background --make-pidfile <%= scope.lookupvar('consul::umask') %> -- \
+    start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid $USER --background --make-pidfile -- \
         $DAEMON_ARGS \
         || return 2
 

diff --git a/templates/consul.launchd.erb b/templates/consul.launchd.erb
@@ -5,7 +5,6 @@
     <key>Label</key>             <string>io.consul.daemon</string>
     <key>UserName</key>          <string><%= scope.lookupvar('consul::user') %></string>
     <key>GroupName</key>         <string><%= scope.lookupvar('consul::group') %></string>
-    <key>Umask</key>             <string><%= scope.lookupvar('consul::umask') %></string>
 <% if scope.lookupvar('consul::service_enable') %>
     <key>Disabled</key>          <false/>
 <% else %>

diff --git a/templates/consul.sles.erb b/templates/consul.sles.erb
@@ -36,7 +36,6 @@ case "$1" in
         echo -n "Starting consul "
         ## Start daemon with startproc(8). If this fails
         ## the return value is set appropriately by startproc.
-        umask <%= scope.lookupvar('consul::umask') %>
         startproc $CONSUL_BIN agent -config-dir "$CONFIG_DIR" <%= scope.lookupvar('consul::extra_options') %> >> "$LOG_FILE"
 
         # Remember status and be verbose

diff --git a/templates/consul.systemd.erb b/templates/consul.systemd.erb
@@ -6,7 +6,6 @@ After=basic.target network.target
 [Service]
 User=<%= scope.lookupvar('consul::user') %>
 Group=<%= scope.lookupvar('consul::group') %>
-Umask=<%= scope.lookupvar('consul::umask') %>
 ExecStart=<%= scope.lookupvar('consul::bin_dir') %>/consul agent \
   -config-dir <%= scope.lookupvar('consul::config_dir') %> <%= scope.lookupvar('consul::extra_options') %>
 ExecReload=/bin/kill -HUP $MAINPID

diff --git a/templates/consul.sysv.erb b/templates/consul.sysv.erb
@@ -52,7 +52,7 @@ start() {
         mkrundir
         [ -f $PID_FILE ] && rm $PID_FILE
         daemon --user=<%= scope.lookupvar('consul::user') %> \
-            --pidfile="$PID_FILE" --umask=<%= scope.lookupvar('consul::umask') %> \
+            --pidfile="$PID_FILE" \
             "$CONSUL" agent -pid-file "${PID_FILE}" -config-dir "$CONFIG" <%= scope.lookupvar('consul::extra_options') %> >> "$LOG_FILE" &
         retcode=$?
         touch /var/lock/subsys/consul

diff --git a/templates/consul.upstart.erb b/templates/consul.upstart.erb
@@ -6,7 +6,6 @@ stop on runlevel [06]
 env CONSUL=<%= scope.lookupvar('consul::bin_dir') %>/consul
 env CONFIG=<%= scope.lookupvar('consul::config_dir') %>
 
-umask <%= scope.lookupvar('consul::umask') %>
 
 script
     # read settings like GOMAXPROCS from "/etc/default/consul", if available.