X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsyncproxy.pp;h=cb017d529555590b23de6f56e17fda612dac0f17;hb=e223cc6541f3d038e37352a0fac74010bd7ca624;hp=5bf3427799a548c7cceb5a0c89f4e05b2d5b2aa8;hpb=da5fb9c9661295cc411b5838ee89698317409c61;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 5bf342779..cb017d529 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,95 +1,76 @@
-class roles::syncproxy {
-	$bind = $::hostname ? {
-		'milanollo' => '5.153.231.9',
-		'mirror-anu' => '150.203.164.60',
-		'mirror-isc' => '149.20.20.21',
-		'mirror-umn' => '128.101.240.216',
-		'klecker' => '130.89.148.10',
-		default => ''
-	}
-	$bind6 = $::hostname ? {
-		'milanollo' => '2001:41c8:1000:21::21:9',
-		'mirror-anu' => '2001:388:1034:2900::3c',
-		'mirror-isc' => '2001:4f8:8:36::1deb:21',
-		'mirror-umn' => '2607:ea00:101:3c0b::1deb:216',
-		'klecker' => '2001:610:1908:b000::148:10',
-		default => ''
-	}
-	$syncproxy_name = $::hostname ? {
-		'milanollo' => 'syncproxy3.eu.debian.org',
-		'mirror-anu' => 'syncproxy.au.debian.org',
-		'mirror-isc' => 'syncproxy2.wna.debian.org',
-		'mirror-umn' => 'syncproxy.cna.debian.org',
-		'klecker' => 'syncproxy2.eu.debian.org',
-		default => 'unknown'
-	}
+# a syncproxy
+# @param syncproxy_name  the service name of this syncproxy
+# @param listen_addr IP addresses to have rsync and apache listen on, and ssh to trigger from
+class roles::syncproxy(
+  String $syncproxy_name,
+  Array[Stdlib::IP::Address] $listen_addr = [],
+) {
+  include roles::archvsync_base
 
-	rsync::site { 'syncproxy':
-		content => template('roles/syncproxy/rsyncd.conf.erb'),
-		bind    => $bind,
-		bind6   => $bind6,
-	}
+  $enclosed_addresses_rsync = empty($listen_addr) ? {
+    true    => ['[::]'],
+    default => enclose_ipv6($listen_addr),
+  }
+  $enclosed_addresses_apache = empty($listen_addr) ? {
+    true    => ['*'],
+    default => enclose_ipv6($listen_addr),
+  }
+  $ssh_source_addresses = empty($listen_addr) ? {
+    true    => $base::public_addresses,
+    default => $listen_addr,
+  }
 
-	file { '/etc/rsyncd':
-		ensure => 'directory'
-	}
+  $mirror_basedir_prefix = hiera('role_config__syncproxy.mirror_basedir_prefix')
 
-	file { '/etc/rsyncd/debian.secrets':
-		owner => 'root',
-		group => 'mirroradm',
-		mode => 0660,
-	}
+  file { '/etc/rsyncd':
+    ensure => 'directory'
+  }
 
-	if $::apache2 and $syncproxy_name != 'unknown' {
-		include apache2::ssl
-		ssl::service { "$syncproxy_name": notify => Service['apache2'], key => true, }
-		apache2::site { '010-syncproxy.debian.org':
-			site   => 'syncproxy.debian.org',
-			content => template('roles/syncproxy/syncproxy.debian.org-apache.erb')
-		}
+  file { '/etc/rsyncd/debian.secrets':
+    owner => 'root',
+    group => 'mirroradm',
+    mode  => '0660',
+  }
 
-		file { [ '/srv/www/syncproxy.debian.org', '/srv/www/syncproxy.debian.org/htdocs' ]:
-			ensure  => directory,
-			mode    => '0755',
-		}
-		file { '/srv/www/syncproxy.debian.org/htdocs/index.html':
-			content => template('roles/syncproxy/syncproxy.debian.org-index.html.erb')
-		}
+  include apache2
+  include apache2::ssl
+  ssl::service { $syncproxy_name:
+    notify => Exec['service apache2 reload'],
+    key    => true,
+  }
+  apache2::site { '010-syncproxy.debian.org':
+    site    => 'syncproxy.debian.org',
+    content => template('roles/syncproxy/syncproxy.debian.org-apache.erb')
+  }
 
-		file { '/etc/rsyncd-syncproxy-stunnel.conf':
-			content => template('roles/syncproxy/rsyncd-syncproxy-stunnel.conf.erb')
-		}
-		xinetd::service { "rsync-syncproxy-ssl":
-			bind        => $bind,
-			id          => "syncproxy-rsync-ssl",
-			server      => '/usr/bin/stunnel4',
-			service     => 'rsync-ssl',
-			type        => 'UNLISTED',
-			port        => '1873',
-			server_args => "/etc/rsyncd-syncproxy-stunnel.conf",
-			ferm        => false,
-			instances   => 50,
-			require     => File["/etc/rsyncd-syncproxy-stunnel.conf"],
-		}
+  file { [ '/srv/www/syncproxy.debian.org', '/srv/www/syncproxy.debian.org/htdocs' ]:
+    ensure => directory,
+    mode   => '0755',
+  }
+  file { '/srv/www/syncproxy.debian.org/htdocs/index.html':
+    content => template('roles/syncproxy/syncproxy.debian.org-index.html.erb')
+  }
 
-		if $bind6 != '' {
-			xinetd::service { "rsync-syncproxy-ssl6":
-				bind        => $bind6,
-				id          => "syncproxy-rsync-ssl",
-				server      => '/usr/bin/stunnel4',
-				service     => 'rsync-ssl',
-				type        => 'UNLISTED',
-				port        => '1873',
-				server_args => "/etc/rsyncd-syncproxy-stunnel.conf",
-				ferm        => false,
-				instances   => 50,
-				require     => File["/etc/rsyncd-syncproxy-stunnel.conf"],
-			}
-		}
+  rsync::site { 'syncproxy':
+    content => template('roles/syncproxy/rsyncd.conf.erb'),
+    binds   => $enclosed_addresses_rsync,
+    sslname => $syncproxy_name,
+  }
 
-		@ferm::rule { "dsa-rsync-ssl":
-			description => "Allow traffic to rsync ssl",
-			rule        => "&SERVICE(${protocol}, 1873)"
-		}
-	}
+
+  # ssh firewalling setup
+  ###
+  @@ferm::rule::simple { "dsa-ssh-from-syncproxy-${::fqdn}":
+    tag         => 'ssh::server::from::syncproxy',
+    description => 'Allow ssh access from a syncproxy',
+    port        => '22',
+    saddr       => $ssh_source_addresses,
+  }
+  # syncproxies should be accessible from various role hosts
+  Ferm::Rule::Simple <<|
+    tag == 'ssh::server::from::syncproxy' or
+    tag == 'ssh::server::from::ftp_master' or
+    tag == 'ssh::server::from::ports_master' or
+    tag == 'ssh::server::from::security_master'
+    |>>
 }