X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=environments%2Fproduction%2Fmanifests%2Froot.pp;h=e2b5d6b11417c6023ad656dd3158f0d46548c49e;hb=b40c49a55b6669eba8858828fc8d5441b8d358c2;hp=d51c17d8ba3e74980189ffb57a478d5cdfb736dd;hpb=417ce970216bcb6221d2e7335e89c65083cdecc5;p=infra.git

diff --git a/environments/production/manifests/root.pp b/environments/production/manifests/root.pp
index d51c17d..e2b5d6b 100644
--- a/environments/production/manifests/root.pp
+++ b/environments/production/manifests/root.pp
@@ -24,6 +24,15 @@ class my_fw::post {
     table    => 'nat',
     chain    => 'PREROUTING',
   } ->
+  firewall { '80 dnat-git':
+    proto  => 'tcp',
+    dport  => '9418',
+    jump => 'DNAT',
+    todest => "${$ips[gitweb]}:9418",
+    iniface => $internet_iface,
+    table    => 'nat',
+    chain    => 'PREROUTING',
+  } ->
   firewall { '80 dnat-htop-ssh':
     proto  => 'tcp',
     dport  => '2222',
@@ -92,11 +101,13 @@ if $signerLocation == 'self' {
     lxc::container { 'front-nginx':
         contname => 'front-nginx',
         ip => $ips[front-nginx],
-        dir => ["/data", "/data-crl", '/data-crl-gigi'],
+        dir => ["/data", "/data-crl", '/data-crl-gigi', '/gitweb-socket', '/srv/git'],
         bind => {
           "/data/nginx" => {target => "data", option => ",ro"},
           "/data/crl" => {target => "data-crl", option => ",ro"},
-          "/data/gigi-crl" => {target => "data-crl-gigi", option => ",ro"}
+          "/data/gigi-crl" => {target => "data-crl-gigi", option => ",ro"},
+          "/run/gitweb-socket" => {target => 'gitweb-socket'},
+          "/data/git" => { 'target' => "srv/git", option => ",ro"}
         },
         require => File['/data/nginx', '/data/crl/htdocs', '/data/gigi-crl']
     }
@@ -110,6 +121,10 @@ if $signerLocation == 'self' {
       ensure => 'directory',
       owner => $administrativeUser
     }
+    file { '/data/git':
+      ensure => 'directory',
+      owner => $administrativeUser,
+    }
     file { '/data/gigi-crl':
       ensure => 'directory',
       owner => $administrativeUser
@@ -174,6 +189,19 @@ if $signerLocation == 'self' {
         contname => 'quiz',
         ip => $ips[quiz]
     }
+    file{'/run/gitweb-socket':
+        ensure => 'directory'
+    }
+    lxc::container { 'gitweb':
+        require => File['/data/git', '/run/gitweb-socket'],
+        contname => 'gitweb',
+        dir => ['/gitweb-socket', '/srv/git'],
+        bind => {
+          "/run/gitweb-socket" => { 'target' => "gitweb-socket"},
+          "/data/git" => { 'target' => "srv/git", option => ",ro"}
+        },
+        ip => $ips[gitweb]
+    }
     # Required for bootstrap-user
     package {'acl':
         ensure => 'installed'