Alexandros Kosiaris has submitted this change and it was merged.
Change subject: url_downloader: remove pre-precise/squid 2 compat
......................................................................
url_downloader: remove pre-precise/squid 2 compat
Change-Id: I0c7a7d4a3143bda10ce0a8e7e96946a8997ab5a4
---
M manifests/role/url_downloader.pp
R modules/url_downloader/files/squid3-logrotate
M modules/url_downloader/manifests/init.pp
M modules/url_downloader/spec/classes/urldownloader_spec.rb
M modules/url_downloader/templates/squid.conf.erb
5 files changed, 21 insertions(+), 72 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/url_downloader.pp b/manifests/role/url_downloader.pp
index c14c07f..3518ef2 100644
--- a/manifests/role/url_downloader.pp
+++ b/manifests/role/url_downloader.pp
@@ -31,24 +31,7 @@
service_ip => $url_downloader_ip
}
- # pin package to the default, Ubuntu version, instead of our own
- if os_version('ubuntu >= 12.04') {
- $pinned_packages = [
- 'squid3',
- 'squid-common3',
- 'squid-langpack',
- ]
- $before_package = 'squid3'
- } else {
- $pinned_packages = [
- 'squid',
- 'squid-common',
- 'squid-langpack',
- ]
- $before_package = 'squid'
- }
-
- apt::pin { $pinned_packages:
+ apt::pin { [ 'squid3', 'squid-common3', 'squid-langpack' ]:
pin => 'release o=Ubuntu',
priority => '1001',
before => Class['::url_downloader'],
diff --git a/modules/url_downloader/templates/squid-logrotate.erb
b/modules/url_downloader/files/squid3-logrotate
similarity index 74%
rename from modules/url_downloader/templates/squid-logrotate.erb
rename to modules/url_downloader/files/squid3-logrotate
index 16948b8..1d1cfc5 100644
--- a/modules/url_downloader/templates/squid-logrotate.erb
+++ b/modules/url_downloader/files/squid3-logrotate
@@ -4,7 +4,7 @@
#
# Logrotate fragment for squid.
#
-/var/log/<%= @package_name %>/*.log {
+/var/log/squid3/*.log {
daily
compress
size 300M
@@ -16,6 +16,6 @@
test ! -x /usr/sbin/sarg-reports || /usr/sbin/sarg-reports
endscript
postrotate
- test ! -e /var/run/<%= @package_name %>.pid || /usr/sbin/<%=
@package_name %> -k rotate
+ test ! -e /var/run/squid3.pid || /usr/sbin/squid3 -k rotate
endscript
}
diff --git a/modules/url_downloader/manifests/init.pp
b/modules/url_downloader/manifests/init.pp
index 873baff..00d551f 100644
--- a/modules/url_downloader/manifests/init.pp
+++ b/modules/url_downloader/manifests/init.pp
@@ -16,40 +16,31 @@
# service_ip => '10.10.10.10' # Probably a public ip though
# }
class url_downloader($service_ip) {
- if os_version('ubuntu >= 12.04') {
- $package_name = 'squid3'
- } else {
- $package_name = 'squid'
- }
-
- $confdir = "/etc/${package_name}"
- $service_name = $package_name
-
- file { "${confdir}/squid.conf":
+ file { '/etc/squid3/squid.conf':
owner => 'root',
group => 'root',
mode => '0444',
content => template('url_downloader/squid.conf.erb'),
}
- file { "/etc/logrotate.d/${package_name}":
+ file { '/etc/logrotate.d/squid3':
ensure => present,
mode => '0444',
owner => 'root',
group => 'root',
- content => template('url_downloader/squid-logrotate.erb'),
+ source => 'puppet:///modules/url_downloader/squid3-logrotate',
}
- package { $package_name:
+ package { 'squid3':
ensure => installed,
}
- service { $service_name:
+ service { 'squid3':
ensure => running,
}
- Package[$package_name] -> Service[$service_name]
- Package[$package_name] -> File["/etc/logrotate.d/${package_name}"]
- Package[$package_name] -> File["${confdir}/squid.conf"]
- File["${confdir}/squid.conf"] ~> Service[$service_name] # also notify
+ Package['squid3'] -> Service['squid3']
+ Package['squid3'] -> File['/etc/logrotate.d/squid3']
+ Package['squid3'] -> File['/etc/squid3/squid.conf']
+ File['/etc/squid3/squid.conf'] ~> Service['squid3'] # also notify
}
diff --git a/modules/url_downloader/spec/classes/urldownloader_spec.rb
b/modules/url_downloader/spec/classes/urldownloader_spec.rb
index b1c811c..282df0c 100644
--- a/modules/url_downloader/spec/classes/urldownloader_spec.rb
+++ b/modules/url_downloader/spec/classes/urldownloader_spec.rb
@@ -7,26 +7,11 @@
}
}
- context 'with ubuntu 10.04' do
- let(:facts) { { :lsbdistid => 'Ubuntu', :lsbdistrelease => '10.04' } }
-
- it { should contain_package('squid') }
- it { should contain_service('squid') }
- it { should contain_file('/etc/logrotate.d/squid') }
- it { should contain_file('/etc/squid/squid.conf').
- with_content(/10.10.10.10/).
- with_content(/^acl all src/)
- }
- end
- context 'with ubuntu 12.04' do
- let(:facts) { { :lsbdistid => 'Ubuntu', :lsbdistrelease => '12.04' } }
-
- it { should contain_package('squid3') }
- it { should contain_service('squid3') }
- it { should contain_file('/etc/logrotate.d/squid3') }
- it { should contain_file('/etc/squid3/squid.conf').
- with_content(/10.10.10.10/).
- with_content(/^acl (?! all src)/)
- }
- end
+ it { should contain_package('squid3') }
+ it { should contain_service('squid3') }
+ it { should contain_file('/etc/logrotate.d/squid3') }
+ it { should contain_file('/etc/squid3/squid.conf').
+ with_content(/10.10.10.10/).
+ with_content(/^acl (?! all src)/)
+ }
end
diff --git a/modules/url_downloader/templates/squid.conf.erb
b/modules/url_downloader/templates/squid.conf.erb
index aabc11e..e208d85 100644
--- a/modules/url_downloader/templates/squid.conf.erb
+++ b/modules/url_downloader/templates/squid.conf.erb
@@ -4,10 +4,6 @@
http_port <%= @service_ip %>:8080
hierarchy_stoplist cgi-bin ?
-<%- if @package_name == 'squid' -%>
-# ACLs that are builtin in squid 3 but not squid 2
-acl all src 0.0.0.0/0.0.0.0
-<%- end -%>
# The following 3 are built-in in squid 3.3 but not squid 3.1
acl manager proto cache_object
acl localhost src 127.0.0.1/255.255.255.255
@@ -18,7 +14,7 @@
acl apache rep_header Server ^Apache
maximum_object_size 1010 MB
cache_replacement_policy heap LFUDA
-access_log /var/log/<%= @package_name %>/access.log squid
+access_log /var/log/squid3/access.log squid
log_mime_hdrs on
hosts_file /etc/hosts
request_header_max_size 1 KB
@@ -77,13 +73,7 @@
tcp_outgoing_address <%= @service_ip %>
-<%- if @package_name == 'squid' -%>
-reply_body_max_size 1059061760 allow all
-cache_dir null /tmp
-broken_vary_encoding allow apache
-<%- else -%>
reply_body_max_size 1010 MB all
-<%- end -%>
cache_mgr r...@wikimedia.org
@@ -94,4 +84,4 @@
via off
-coredump_dir /var/spool/<%= @package_name %>
+coredump_dir /var/spool/squid3
--
To view, visit https://gerrit.wikimedia.org/r/179078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c7a7d4a3143bda10ce0a8e7e96946a8997ab5a4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
