Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322830
Change subject: installserver: split squid proxy to own class (kill carbon WIP)
......................................................................
installserver: split squid proxy to own class (kill carbon WIP)
Change-Id: Ib462d470277f6c1676ecd273b63d0e83be75a6ed
---
M manifests/site.pp
M modules/role/manifests/installserver.pp
A modules/role/manifests/installserver/proxy.pp
3 files changed, 40 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/322830/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 44a572f..1d0a26d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -223,8 +223,12 @@
# DHCP / TFTP
node 'carbon.wikimedia.org' {
- role(installserver, installserver::tftp_server, installserver::dhcp,
+ role(installserver,
+ installserver::tftp_server,
+ installserver::dhcp,
+ installserver::proxy,
aptrepo::wikimedia)
+
$cluster = 'misc'
interface::add_ip6_mapped { 'main':
diff --git a/modules/role/manifests/installserver.pp
b/modules/role/manifests/installserver.pp
index 3c93294..1b41bed 100644
--- a/modules/role/manifests/installserver.pp
+++ b/modules/role/manifests/installserver.pp
@@ -30,38 +30,9 @@
include role::backup::host
include install_server::preseed_server
- if os_version('ubuntu >= trusty') or os_version('debian >= jessie') {
- $config_content = template('role/caching-proxy/squid.conf.erb')
- } else {
- $config_content = template('role/squid3/precise_acls_conf.erb',
'role/caching-proxy/squid.conf.erb')
- }
-
- class { 'squid3':
- config_content => $config_content,
- }
-
- cron { 'squid-logrotate':
- ensure => 'present',
- command => '/usr/sbin/squid3 -k rotate',
- user => 'root',
- hour => '17',
- minute => '15',
- }
-
- ferm::service { 'proxy':
- proto => 'tcp',
- port => '8080',
- srange => '$PRODUCTION_NETWORKS',
- }
-
# Backup
$sets = [ 'srv-autoinstall',
]
backup::set { $sets : }
- # Monitoring
- monitoring::service { 'squid':
- description => 'Squid',
- check_command => 'check_tcp!8080',
- }
}
diff --git a/modules/role/manifests/installserver/proxy.pp
b/modules/role/manifests/installserver/proxy.pp
new file mode 100644
index 0000000..b9a81dd
--- /dev/null
+++ b/modules/role/manifests/installserver/proxy.pp
@@ -0,0 +1,35 @@
+
+# Installs a proxy server for the install server
+class role::installserver::proxy {
+
+ if os_version('ubuntu >= trusty') or os_version('debian >= jessie') {
+ $config_content = template('role/caching-proxy/squid.conf.erb')
+ } else {
+ $config_content = template('role/squid3/precise_acls_conf.erb',
'role/caching-proxy/squid.conf.erb')
+ }
+
+ class { 'squid3':
+ config_content => $config_content,
+ }
+
+ cron { 'squid-logrotate':
+ ensure => 'present',
+ command => '/usr/sbin/squid3 -k rotate',
+ user => 'root',
+ hour => '17',
+ minute => '15',
+ }
+
+ ferm::service { 'proxy':
+ proto => 'tcp',
+ port => '8080',
+ srange => '$PRODUCTION_NETWORKS',
+ }
+
+ # Monitoring
+ monitoring::service { 'squid':
+ description => 'Squid',
+ check_command => 'check_tcp!8080',
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/322830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib462d470277f6c1676ecd273b63d0e83be75a6ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
