Faidon has submitted this change and it was merged. Change subject: Revert "Puppetizing /etc/init.d/rsync and /etc/default/rsync" ......................................................................
Revert "Puppetizing /etc/init.d/rsync and /etc/default/rsync" This reverts commit 92163b4b6dffba400f3376c5cc6a5ee4d6afeaab from a year ago. Why on earth would we change pidfile and config file location?! Change-Id: I84e68b55d9699897fe381c8dc71f7278e906039c --- M modules/rsync/CHANGELOG M modules/rsync/manifests/server.pp M modules/rsync/templates/header.erb M modules/rsync/templates/module.erb D modules/rsync/templates/rsync.default.erb D modules/rsync/templates/rsync.init.erb 6 files changed, 9 insertions(+), 227 deletions(-) Approvals: Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/rsync/CHANGELOG b/modules/rsync/CHANGELOG index 7ea844c..52fd8f7 100644 --- a/modules/rsync/CHANGELOG +++ b/modules/rsync/CHANGELOG @@ -4,9 +4,7 @@ * 2012-08-30 0.1.0-wmf - Removed xinetd support ([email protected]) - Removed '< I <3 Puppet Labs >' default motd. -- Puppetized /etc/init.d/rsync and /etc/default/rsync. -- Changed default config file to rsyncd.conf (was rsync.conf) -- Changed default pid file to rsyncd.pid (was rsync.pid) + * 2012-06-07 0.1.0 - Initial release diff --git a/modules/rsync/manifests/server.pp b/modules/rsync/manifests/server.pp index 21f9d60..cd13cfc 100644 --- a/modules/rsync/manifests/server.pp +++ b/modules/rsync/manifests/server.pp @@ -11,7 +11,7 @@ # into the WMF puppet repository. - otto class rsync::server( - $use_xinetd = false, # this parameter should not be used. xinetd is not available. + # $use_xinetd = true, $address = '0.0.0.0', $motd_file = 'UNSET', $log_file = 'UNSET', @@ -19,26 +19,6 @@ ) inherits rsync { $rsync_fragments = '/etc/rsync.d' - $rsync_conf = '/etc/rsyncd.conf' - $rsync_pid = '/var/run/rsyncd.pid' - - # rsync daemon defaults file - file { "/etc/default/rsync": - mode => 0644, - owner => root, - group => root, - content => template("rsync/rsync.default.erb"), - ensure => present; - } - # rsync daemon init.d file - file { "/etc/init.d/rsync": - mode => 0755, - owner => root, - group => root, - content => template("rsync/rsync.init.erb"), - ensure => present; - } - # if($use_xinetd) { # include xinetd @@ -46,14 +26,14 @@ # bind => $address, # port => '873', # server => '/usr/bin/rsync', - # server_args => '--daemon --config ${rsync_conf}', + # server_args => '--daemon --config /etc/rsync.conf', # require => Package['rsync'], # } # } else { service { 'rsync': ensure => running, enable => true, - subscribe => [Exec['compile fragments'], File["/etc/default/rsync"], File["/etc/init.d/rsync"]], + subscribe => Exec['compile fragments'], } # } @@ -77,7 +57,7 @@ # which happens with cobbler systems by default exec { 'compile fragments': refreshonly => true, - command => "ls ${rsync_fragments}/frag-* 1>/dev/null 2>/dev/null && if [ $? -eq 0 ]; then cat ${rsync_fragments}/header ${rsync_fragments}/frag-* > ${rsync_conf}; else cat ${rsync_fragments}/header > ${rsync_conf}; fi; $(exit 0)", + command => "ls ${rsync_fragments}/frag-* 1>/dev/null 2>/dev/null && if [ $? -eq 0 ]; then cat ${rsync_fragments}/header ${rsync_fragments}/frag-* > /etc/rsync.conf; else cat ${rsync_fragments}/header > /etc/rsync.conf; fi; $(exit 0)", subscribe => File["${rsync_fragments}/header"], path => '/bin:/usr/bin', } diff --git a/modules/rsync/templates/header.erb b/modules/rsync/templates/header.erb index 8a086a5..713d494 100644 --- a/modules/rsync/templates/header.erb +++ b/modules/rsync/templates/header.erb @@ -1,7 +1,7 @@ # This file is being maintained by Puppet. # DO NOT EDIT -pid file = <%= rsync_pid %> +pid file = /var/run/rsyncd.pid uid = nobody gid = nobody use chroot = <%= use_chroot %> @@ -9,6 +9,5 @@ log format = %t %a %m %f %b syslog facility = local3 timeout = 300 -# This doesn't seem to work with rsync on Ubuntu? -# address = <%= address %> +address = <%= address %> <% if motd_file != 'UNSET' %>motd file = <%= motd_file %><% end %> diff --git a/modules/rsync/templates/module.erb b/modules/rsync/templates/module.erb index 33aacbf..0ccc34c 100644 --- a/modules/rsync/templates/module.erb +++ b/modules/rsync/templates/module.erb @@ -8,6 +8,8 @@ list = <%= list %> uid = <%= uid %> gid = <%= gid %> +incoming chmod = <%= incoming_chmod %> +outgoing chmod = <%= outgoing_chmod %> max connections = <%= max_connections %> <% if Integer(max_connections) > 0 %>lock file = <%= lock_file %><% end %> <% if comment != :undef %>comment = <%= comment %><% end %> diff --git a/modules/rsync/templates/rsync.default.erb b/modules/rsync/templates/rsync.default.erb deleted file mode 100644 index 8eab764..0000000 --- a/modules/rsync/templates/rsync.default.erb +++ /dev/null @@ -1,37 +0,0 @@ -##################################################################### -### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/rsync/rsync.default -##################################################################### - -# defaults file for rsync daemon mode - -# start rsync in daemon mode from init.d script? -# only allowed values are "true", "false", and "inetd" -# Use "inetd" if you want to start the rsyncd from inetd, -# all this does is prevent the init.d script from printing a message -# about not starting rsyncd (you still need to modify inetd's config yourself). -RSYNC_ENABLE=<%= use_xinetd == true ? 'false' : 'true' %> - -# which file should be used as the configuration file for rsync. -# This file is used instead of the default /etc/rsyncd.conf -# Warning: This option has no effect if the daemon is accessed -# using a remote shell. When using a different file for -# rsync you might want to symlink /etc/rsyncd.conf to -# that file. -RSYNC_CONFIG_FILE=<%= rsync_conf %> - -# what extra options to give rsync --daemon? -# that excludes the --daemon; that's always done in the init.d script -# Possibilities are: -# --address=123.45.67.89 (bind to a specific IP address) -# --port=8730 (bind to specified port; default 873) -RSYNC_OPTS='' - -# run rsyncd at a nice level? -# the rsync daemon can impact performance due to much I/O and CPU usage, -# so you may want to run it at a nicer priority than the default priority. -# Allowed values are 0 - 19 inclusive; 10 is a reasonable value. -RSYNC_NICE='10' - -# Don't forget to create an appropriate config file, -# else the daemon will not start. diff --git a/modules/rsync/templates/rsync.init.erb b/modules/rsync/templates/rsync.init.erb deleted file mode 100644 index 212d627..0000000 --- a/modules/rsync/templates/rsync.init.erb +++ /dev/null @@ -1,160 +0,0 @@ -#! /bin/sh - -### BEGIN INIT INFO -# Provides: rsyncd -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $named -# Default-Start: 2 3 4 5 -# Default-Stop: -# Short-Description: fast remote file copy program daemon -# Description: rsync is a program that allows files to be copied to and -# from remote machines in much the same way as rcp. -# This provides rsyncd daemon functionality. -### END INIT INFO - -set -e - -# /etc/init.d/rsync: start and stop the rsync daemon - -DAEMON=/usr/bin/rsync -RSYNC_ENABLE=false -RSYNC_OPTS='' -RSYNC_DEFAULTS_FILE=/etc/default/rsync -RSYNC_CONFIG_FILE=<%= rsync_conf %> -RSYNC_PID_FILE=<%= rsync_pid %> -RSYNC_NICE_PARM='' -RSYNC_IONICE_PARM='' - -test -x $DAEMON || exit 0 - -. /lib/lsb/init-functions - -if [ -s $RSYNC_DEFAULTS_FILE ]; then - . $RSYNC_DEFAULTS_FILE - case "x$RSYNC_ENABLE" in - xtrue|xfalse) - ;; - xinetd) - exit 0 - ;; - *) - log_failure_msg "Value of RSYNC_ENABLE in $RSYNC_DEFAULTS_FILE must be either 'true' or 'false';" - log_failure_msg "not starting rsync daemon." - exit 1 - ;; - esac - - case "x$RSYNC_NICE" in - x[0-9]) RSYNC_NICE_PARM="--nicelevel $RSYNC_NICE";; - x1[0-9]) RSYNC_NICE_PARM="--nicelevel $RSYNC_NICE";; - x) ;; - *) - log_warning_msg "Value of RSYNC_NICE in $RSYNC_DEFAULTS_FILE must be a value between 0 and 19 (inclusive);" - log_warning_msg "ignoring RSYNC_NICE now." - ;; - esac - - case "x$RSYNC_IONICE" in - x-c[123]*) RSYNC_IONICE_PARM="$RSYNC_IONICE";; - x) ;; - *) - log_warning_msg "Value of RSYNC_IONICE in $RSYNC_DEFAULTS_FILE must be -c1, -c2 or -c3;" - log_warning_msg "ignoring RSYNC_IONICE now." - ;; - esac -fi - -export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" - -rsync_start() { - if [ ! -s "$RSYNC_CONFIG_FILE" ]; then - log_failure_msg "missing or empty config file $RSYNC_CONFIG_FILE" - log_end_msg 1 - exit 0 - fi - # See ionice(1) - if [ -n "$RSYNC_IONICE_PARM" ] && [ -x /usr/bin/ionice ] && - /usr/bin/ionice "$RSYNC_IONICE_PARM" true 2>/dev/null; then - /usr/bin/ionice "$RSYNC_IONICE_PARM" -p$$ > /dev/null 2>&1 - fi - if start-stop-daemon --start --quiet --background \ - --pidfile $RSYNC_PID_FILE \ - $RSYNC_NICE_PARM --exec $DAEMON \ - -- --no-detach --daemon --config "$RSYNC_CONFIG_FILE" $RSYNC_OPTS - then - rc=0 - sleep 1 - if ! kill -0 $(cat $RSYNC_PID_FILE) >/dev/null 2>&1; then - log_failure_msg "rsync daemon failed to start" - rc=1 - fi - else - rc=1 - fi - if [ $rc -eq 0 ]; then - log_end_msg 0 - else - log_end_msg 1 - rm -f $RSYNC_PID_FILE - fi -} # rsync_start - - -case "$1" in - start) - if "$RSYNC_ENABLE"; then - log_daemon_msg "Starting rsync daemon" "rsync" - if [ -s $RSYNC_PID_FILE ] && kill -0 $(cat $RSYNC_PID_FILE) >/dev/null 2>&1; then - log_progress_msg "apparently already running" - log_end_msg 0 - exit 0 - fi - rsync_start - else - if [ -s "$RSYNC_CONFIG_FILE" ]; then - [ "$VERBOSE" != no ] && log_warning_msg "rsync daemon not enabled in $RSYNC_DEFAULTS_FILE, not starting..." - fi - fi - ;; - stop) - log_daemon_msg "Stopping rsync daemon" "rsync" - start-stop-daemon --stop --quiet --oknodo --pidfile $RSYNC_PID_FILE - log_end_msg $? - rm -f $RSYNC_PID_FILE - ;; - - reload|force-reload) - log_warning_msg "Reloading rsync daemon: not needed, as the daemon" - log_warning_msg "re-reads the config file whenever a client connects." - ;; - - restart) - set +e - if $RSYNC_ENABLE; then - log_daemon_msg "Restarting rsync daemon" "rsync" - if [ -s $RSYNC_PID_FILE ] && kill -0 $(cat $RSYNC_PID_FILE) >/dev/null 2>&1; then - start-stop-daemon --stop --quiet --oknodo --pidfile $RSYNC_PID_FILE || true - sleep 1 - else - log_warning_msg "rsync daemon not running, attempting to start." - rm -f $RSYNC_PID_FILE - fi - rsync_start - else - if [ -s "$RSYNC_CONFIG_FILE" ]; then - [ "$VERBOSE" != no ] && log_warning_msg "rsync daemon not enabled in $RSYNC_DEFAULTS_FILE, not starting..." - fi - fi - ;; - - status) - status_of_proc -p $RSYNC_PID_FILE "$DAEMON" rsync - exit $? # notreached due to set -e - ;; - *) - echo "Usage: /etc/init.d/rsync {start|stop|reload|force-reload|restart|status}" - exit 1 -esac - -exit 0 -- To view, visit https://gerrit.wikimedia.org/r/70991 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84e68b55d9699897fe381c8dc71f7278e906039c Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon <[email protected]> Gerrit-Reviewer: Faidon <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
