Andrew Bogott has submitted this change and it was merged.
Change subject: Remove the now unused generic::rsyncd
......................................................................
Remove the now unused generic::rsyncd
Change-Id: I851ec5c4315075e7ee7c95298fdd4e4b819027a3
---
D files/rsync/rsync.default
M manifests/generic-definitions.pp
2 files changed, 0 insertions(+), 95 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/rsync/rsync.default b/files/rsync/rsync.default
deleted file mode 100644
index a6f2479..0000000
--- a/files/rsync/rsync.default
+++ /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=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=
-
-# 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/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 702ba99..c10fc31 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -502,64 +502,6 @@
}
}
-
-# Class: generic::rsyncd
-# Starts an rsyncd daemon. Must specify either $config or $content.
-#
-# Usage:
-# class { "generic::rsyncd": config => "home" } # will put
files/rsync/rsyncd.conf.home at /etc/rsyncd.conf
-# class { "generic::rsyncd": content => template('udp2log/rsyncd.conf.erb) }
# will render this .erb file at /etc/rsyncd.conf
-#
-# Parameters:
-# $config - name of rsyncd.conf file to use from
files/rsync/rsyncd.conf.$config
-# $content - content to render into /etc/rsyncd.conf
-#
-class generic::rsyncd($config = undef, $content = undef) {
-
- package { "rsync":
- ensure => latest;
- }
-
- # rsync daemon defaults file
- file { "/etc/default/rsync":
- require => Package[rsync],
- mode => 0644,
- owner => root,
- group => root,
- source => "puppet:///files/rsync/rsync.default",
- ensure => present;
- }
-
- # rsyncd.conf, content either comes from source file or passed in
content
- file { "/etc/rsyncd.conf":
- require => Package[rsync],
- mode => 0644,
- owner => root,
- group => root,
- ensure => present;
- }
-
- # if $config name was given, then use the file
- if $config {
- File["/etc/rsyncd.conf"] { source =>
"puppet:///files/rsync/rsyncd.conf.$config" }
- }
- # else if using $content, just render the given content
- elsif $content {
- File["/etc/rsyncd.conf"] { content => $content }
- }
- # else alert an error
- else {
- alert("generic::rsyncd '${title}' must specify one of \$config,
\$content")
- }
-
- # start up the rsync daemon
- service { rsync:
- require => [Package["rsync"], File["/etc/rsyncd.conf"],
File["/etc/default/rsync"]],
- ensure => running,
- subscribe => [File["/etc/rsyncd.conf"],
File["/etc/default/rsync"]],
- }
-}
-
class generic::gluster-client {
package { "glusterfs-client":
--
To view, visit https://gerrit.wikimedia.org/r/71127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I851ec5c4315075e7ee7c95298fdd4e4b819027a3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[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
