X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Frsync%2Fmanifests%2Fsite.pp;h=60cab396d1e7d89179628511d09d63e90530221d;hb=1362b9d1c582c0e2063ef93d893a45d775d49e0d;hp=394b895b446af060d6e9983b2ec2393b4e563a29;hpb=effa893ba6f0fd5d351ee14fd6ef551f66e7e245;p=mirror%2Fdsa-puppet.git

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index 394b895b4..60cab396d 100644
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -1,50 +1,128 @@
 define rsync::site (
-	$bind='',
-	$source='',
-	$content='',
-	$fname='/etc/rsyncd.conf',
+	$binds=['[::]'],
+	$source=undef,
+	$content=undef,
 	$max_clients=200,
-	$ensure=present
-){
-
+	$ensure=present,
+	$sslname=undef,
+) {
 	include rsync
 
+	$fname_real_rsync = "/etc/rsyncd-${name}.conf"
+	$fname_real_stunnel = "/etc/rsyncd-${name}-stunnel.conf"
+
 	case $ensure {
 		present,absent: {}
 		default: { fail ( "Invald ensure `${ensure}' for ${name}" ) }
 	}
 
-	if ($source and $content) {
-		fail ( "Can't define both source and content for ${name}" )
+	$ensure_service = $ensure ? {
+		present => running,
+		absent  => stopped,
+	}
+
+	$ensure_enable = $ensure ? {
+		present => true,
+		absent  => false,
+	}
+
+	file { $fname_real_rsync:
+		ensure  => $ensure,
+		content => $content,
+		source  => $source,
+		owner   => 'root',
+		group   => 'root',
+		mode    => '0444',
+	}
+
+	file { "/etc/systemd/system/rsyncd-${name}@.service":
+		ensure  => $ensure,
+		content => template('rsync/systemd-rsyncd.service.erb'),
+		owner   => 'root',
+		group   => 'root',
+		mode    => '0444',
+		require => File[$fname_real_rsync],
+		notify  => Exec['systemctl daemon-reload'],
+	}
+
+	file { "/etc/systemd/system/rsyncd-${name}.socket":
+		ensure  => $ensure,
+		content => template('rsync/systemd-rsyncd.socket.erb'),
+		owner   => 'root',
+		group   => 'root',
+		mode    => '0444',
+		notify  => [
+			Exec['systemctl daemon-reload'],
+			Service["rsyncd-${name}.socket"],
+		],
+	}
+
+	service { "rsyncd-${name}.socket":
+		ensure   => $ensure_service,
+		enable   => $ensure_enable,
+		require  => [
+			Exec['systemctl daemon-reload'],
+			File["/etc/systemd/system/rsyncd-${name}@.service"],
+			File["/etc/systemd/system/rsyncd-${name}.socket"],
+		],
+		provider => systemd,
 	}
 
-	if $source {
-		file { $fname:
-			ensure => $ensure,
-			noop   => true,
-			source => $source
+	if $sslname {
+		file { $fname_real_stunnel:
+			ensure  => $ensure,
+			content => template('rsync/systemd-rsyncd-stunnel.conf.erb'),
+			owner   => 'root',
+			group   => 'root',
+			mode    => '0444',
+			require => File["/etc/ssl/debian/certs/${sslname}.crt-chained"],
 		}
-	} elsif $content {
-		file { $fname:
+
+		file { "/etc/systemd/system/rsyncd-${name}-stunnel@.service":
 			ensure  => $ensure,
-			noop    => true,
-			content => $content,
+			content => template('rsync/systemd-rsyncd-stunnel.service.erb'),
+			owner   => 'root',
+			group   => 'root',
+			mode    => '0444',
+			require => File[$fname_real_stunnel],
+			notify  => Exec['systemctl daemon-reload'],
 		}
-	} else {
-		fail ( "Can't find config for ${name}" )
-	}
 
-	xinetd::service { "rsync-${name}":
-		noop        => true,
-		bind        => $bind,
-		id          => "${name}-rsync",
-		server      => '/usr/sbin/rsyncd',
-		port        => 'rsync',
-		server_args => $fname,
-		ferm        => false,
-		instances   => $max_clients,
-		require     => File[$fname]
-	}
+		file { "/etc/systemd/system/rsyncd-${name}-stunnel.socket":
+			ensure  => $ensure,
+			content => template('rsync/systemd-rsyncd-stunnel.socket.erb'),
+			owner   => 'root',
+			group   => 'root',
+			mode    => '0444',
+			notify  => [
+				Exec['systemctl daemon-reload'],
+				Service["rsyncd-${name}-stunnel.socket"]
+			],
+		}
 
-	Service['rsync']->Service['xinetd']
+		service { "rsyncd-${name}-stunnel.socket":
+			ensure   => $ensure_service,
+			enable   => $ensure_enable,
+			require  => [
+				Exec['systemctl daemon-reload'],
+				File["/etc/systemd/system/rsyncd-${name}-stunnel@.service"],
+				File["/etc/systemd/system/rsyncd-${name}-stunnel.socket"],
+				Service["rsyncd-${name}.socket"],
+			],
+			provider => systemd,
+		}
+
+		@ferm::rule { "rsync-${name}-ssl":
+			domain      => '(ip ip6)',
+			description => 'Allow rsync access',
+			rule        => '&SERVICE(tcp, 1873)',
+		}
+
+		dnsextras::tlsa_record{ "tlsa-${sslname}-1873":
+			zone     => 'debian.org',
+			certfile => [ "/srv/puppet.debian.org/from-letsencrypt/${sslname}.crt" ],
+			port     => 1873,
+			hostname => $sslname,
+		}
+	}
 }