Andrew Bogott has submitted this change and it was merged.

Change subject: url-downloader: convert into a module
......................................................................


url-downloader: convert into a module

Change-Id: Ie2d40a6fce128d33cedca2bbb430ae42768069ac
---
D manifests/misc/url-downloader.pp
M manifests/site.pp
R modules/url-downloader/files/copy-by-url-proxy.conf
A modules/url-downloader/manifests/init.pp
4 files changed, 33 insertions(+), 31 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/misc/url-downloader.pp b/manifests/misc/url-downloader.pp
deleted file mode 100644
index fd56b93..0000000
--- a/manifests/misc/url-downloader.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-class misc::url-downloader {
-       system::role { "misc::url-downloader": description => "Upload-by-URL 
proxy" }
-
-       file { "/etc/squid/squid.conf":
-               require => Package[squid],
-               mode => 0444,
-               owner => root,
-               group => root,
-               path => "/etc/squid/squid.conf",
-               source => "puppet:///files/squid/copy-by-url-proxy.conf";
-       }
-
-       # pin package to the default, Ubuntu version, instead of our own
-       apt::pin { [ 'squid', 'squid-common' ]:
-               pin      => 'release o=Ubuntu',
-               priority => '1001',
-               before   => Package['squid'],
-       }
-
-       package { squid:
-               ensure => latest;
-       }
-
-       service { squid:
-               require => [ File["/etc/squid/squid.conf"], Package[squid], 
Interface::Ip["misc::url-downloader"] ],
-               subscribe => File["/etc/squid/squid.conf"],
-               ensure => running;
-       }
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 5b30a61..5322c73 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1351,12 +1351,12 @@
 }
 
 node "linne.wikimedia.org" {
-    interface::ip { "misc::url-downloader": interface => "eth0", address => 
"208.80.152.143" }
+    interface::ip { 'url-downloader': interface => 'eth0', address => 
'208.80.152.143' }
 
     include base,
         ganglia,
         exim::simple-mail-sender,
-        misc::url-downloader
+        url-downloader
 
     class { 'ntp::server':
         servers => [ "198.186.191.229", "64.113.32.2", "173.8.198.242", 
"208.75.88.4", "75.144.70.35" ],
diff --git a/files/squid/copy-by-url-proxy.conf 
b/modules/url-downloader/files/copy-by-url-proxy.conf
similarity index 100%
rename from files/squid/copy-by-url-proxy.conf
rename to modules/url-downloader/files/copy-by-url-proxy.conf
diff --git a/modules/url-downloader/manifests/init.pp 
b/modules/url-downloader/manifests/init.pp
new file mode 100644
index 0000000..89d9199
--- /dev/null
+++ b/modules/url-downloader/manifests/init.pp
@@ -0,0 +1,31 @@
+class url-downloader {
+    system::role { 'url-downloader': description => 'Upload-by-URL proxy' }
+
+    file { '/etc/squid/squid.conf':
+        require => Package['squid'],
+        mode    => '0444',
+        owner   => 'root',
+        group   => 'root',
+        path    => '/etc/squid/squid.conf',
+        source  => 'puppet:///url-downloader/copy-by-url-proxy.conf',
+    }
+
+    # pin package to the default, Ubuntu version, instead of our own
+    apt::pin { [ 'squid', 'squid-common' ]:
+        pin      => 'release o=Ubuntu',
+        priority => '1001',
+        before   => Package['squid'],
+    }
+
+    package { 'squid':
+        ensure => latest,
+    }
+
+    service { 'squid':
+        ensure    => running,
+        require   => [  File['/etc/squid/squid.conf'],
+                        Package['squid'],
+                        Interface::Ip['url-downloader']],
+        subscribe => File['/etc/squid/squid.conf'],
+    }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/107590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2d40a6fce128d33cedca2bbb430ae42768069ac
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to