Switch the yum master over to using nginx, add those configs, and add…

… createrepo to the yum module
mikecanz · Mar 2, 2012 · dc43324 · dc43324
1 parent 6358dce
commit dc43324
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
@@ -45,7 +45,6 @@
     }
 
     if $ec2_security_groups =~ /yum-master/ {
-        include httpd
         include yum::master
     }
 

diff --git a/modules/yum/files/etc/nginx/conf.d/yum.conf b/modules/yum/files/etc/nginx/conf.d/yum.conf
@@ -0,0 +1,10 @@
+# THIS FILE IS MAINTAINED BY PUPPET
+server {
+    listen       80;
+    server_name  _;
+
+    location / {
+        root   /yumvol/yum;
+        autoindex on;
+    }
+}
diff --git a/modules/yum/manifests/init.pp b/modules/yum/manifests/init.pp
@@ -2,14 +2,14 @@
 
     Package { require => File["/etc/yum.repos.d/external.repo","/etc/yum.repos.d/epel.repo"], }
 
-    package { "redhat-lsb":
+    package { [
+                "redhat-lsb",
+                "yum-plugin-downloadonly",
+                "createrepo",
+              ]:
         ensure => latest,
     }
 
-    package { "yum-plugin-downloadonly":
-        ensure => latest,
-    }
-
     #file { "/etc/yum.repos.d/internal.repo":
     #    owner => "root",
     #    group => "root",

diff --git a/modules/yum/manifests/master.pp b/modules/yum/manifests/master.pp
@@ -1,8 +1,8 @@
 class yum::master inherits yum {
-    include httpd
+    include nginx
 
-    file { "/etc/httpd/vhosts.d/yum.conf":
-        source => "puppet:///modules/yum/etc/httpd/vhosts.d/yum.conf",
+    file { "/etc/nginx/conf.d/yum.conf":
+        source => "puppet:///modules/yum/etc/nginx/conf.d/yum.conf",
         owner => "root",
         group => "root",
         mode  => 664,