X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=environments%2Fproduction%2Fmanifests%2Fnginx.pp;h=3f896c24b8c0b7db29a76aa95be822f4bdbffbdd;hb=86a085d6ae79d35d3d8f0ea780d04284d0727db3;hp=021c5d40623b256ec5c288383c9310b8abcd8467;hpb=417ce970216bcb6221d2e7335e89c65083cdecc5;p=infra.git

diff --git a/environments/production/manifests/nginx.pp b/environments/production/manifests/nginx.pp
index 021c5d4..3f896c2 100644
--- a/environments/production/manifests/nginx.pp
+++ b/environments/production/manifests/nginx.pp
@@ -30,6 +30,15 @@ define front_vhost($source, $crt = undefined){
 node front-nginx {
   include container::contained;
   include container::no_ssh;
+  apt_key{ 'E643C483A426BB5311D26520A631B6AF9FD3DF94':
+    source => 'http://deb.dogcraft.de/signer.gpg',
+    ensure => 'present'
+  } ->
+    file { '/etc/apt/sources.list.d/dogcraft.list':
+      source => 'puppet:///modules/lxc/dogcraft.list',
+      ensure => 'present',
+      notify => Exec['apt_update']
+  }
   package{ 'nginx-light':
     ensure => 'installed'
   }
@@ -43,6 +52,13 @@ node front-nginx {
     source => 'crl/nginx',
     notify => Service['nginx']
   }
+  package{'wpia-infradocs':
+    ensure => 'installed'
+  } ->
+  front_vhost{'infradocs':
+    source => 'infradocs/nginx',
+    notify => Service['nginx']
+  }
   if($protected != 'no') {
     file{'/etc/nginx/access.txt':
       content => $protected,
@@ -63,6 +79,16 @@ node front-nginx {
     notify => Service['nginx']
   }
   service {'nginx':
-    ensure => 'running'
+    ensure => 'running',
+    enable => true,
+  }
+  #for gitweb hosting
+  package{'git':
+    ensure=>'installed'
+  }
+  front_vhost{'gitweb':
+    source => 'gitweb/nginx.epp',
+    notify => Service['nginx'],
+    crt => 'gitweb/web'
   }
 }