add: real testing for testserver and real pro-version for real system

Change-Id: Ib067212ac34438e364df08166af72c3103320175

diff --git a/environments/production/manifests/gigi.pp b/environments/production/manifests/gigi.pp
index d90c73abf3a6952626f87b65c37f301defe0cace..99ce28b0735d1fabb13e6c2210b52309e397e68b 100644 (file)
--- a/environments/production/manifests/gigi.pp
+++ b/environments/production/manifests/gigi.pp
@@ -5,14 +5,18 @@ node gigi {
   file { "${::puppet_vardir}/debconf/":
      ensure => 'directory'
   }
+  $gigi_pkg = $testServer ? {
+    'true' => 'wpia-gigi-testing',
+    default => 'wpia-gigi'
+  }
   file { "${::puppet_vardir}/debconf/gigi-lang.debconf":
      ensure => 'present',
-     content => "wpia-gigi-testing     wpia-gigi-testing/fetch-locales-command       string  gigi fetch-locales $gigi_translation"
+     content => "$gigi_pkg     $gigi_pkg/fetch-locales-command       string  gigi fetch-locales $gigi_translation"
   } ->
-  exec { 'debconf-gigi-testing':
+  exec { 'debconf-gigi':
     path => "/usr/bin",
     command => "/usr/bin/debconf-set-selections < ${::puppet_vardir}/debconf/gigi-lang.debconf",
-    unless => "/usr/bin/debconf-get-selections | /bin/grep -F '$gigi_translation'"
+    unless => "/usr/bin/debconf-get-selections | /bin/grep -F '$gigi_translation' | /bin/grep -F '$gigi_pkg/fetch-locales'"
   }
 
   class{'apt':}
@@ -25,8 +29,8 @@ node gigi {
     ensure => 'present',
     notify => Exec['apt_update']
   }
-  package { 'wpia-gigi-testing':
-    require => [Exec['debconf-gigi-testing'],Exec['apt_update']],
+  package { $gigi_pkg:
+    require => [Exec['debconf-gigi'],Exec['apt_update']],
     ensure => 'installed',
   }
   $gigi_pg_ip = $ips[postgres];
@@ -57,7 +61,7 @@ node gigi {
   exec {'keytool for /var/lib/wpia-gigi/config/cacerts.jks':
     cwd => '/var/lib/wpia-gigi/config/ca',
     refreshonly => true,
-    require => Package['wpia-gigi-testing'],
+    require => Package[$gigi_pkg],
     command => '/bin/rm -f ../cacerts.jks && /usr/bin/keytool -importcert -keystore ../cacerts.jks -noprompt -storepass changeit -file root.crt -alias root && for i in assured.crt codesign.crt env.crt orga.crt orgaSign.crt unassured.crt *_*.crt; do /usr/bin/keytool -importcert -keystore ../cacerts.jks -storepass changeit -file "$i" -alias "${i%.crt}"; done',
   }
   file {'/var/lib/wpia-gigi/config/truststorepw':
@@ -88,12 +92,12 @@ node gigi {
   file {'/var/lib/wpia-gigi/keys/crt':
     ensure => 'directory',
     owner => 'gigi',
-    require => Package['wpia-gigi-testing']
+    require => Package[$gigi_pkg]
   }
   file {'/var/lib/wpia-gigi/keys/csr':
     ensure => 'directory',
     owner => 'gigi',
-    require => Package['wpia-gigi-testing']
+    require => Package[$gigi_pkg]
   }
   exec {'/gigi-ready':
     creates => '/gigi-ready',
@@ -103,12 +107,12 @@ node gigi {
   exec{'alexa':
     command => '/usr/bin/gigi fetch-alexa /var/lib/wpia-gigi/blacklist.dat 100',
     creates => '/var/lib/wpia-gigi/blacklist.dat',
-    require => [File['/var/lib/wpia-gigi'],Package['wpia-gigi-testing']]
+    require => [File['/var/lib/wpia-gigi'],Package[$gigi_pkg]]
   } -> service{'gigi-proxy.socket':
     ensure => 'running',
     provider => 'systemd',
     subscribe => [Exec['tar for gigi-conf'],File['/var/lib/wpia-gigi/config/profiles']],
-    require => [Package['wpia-gigi-testing'], File['/var/lib/wpia-gigi/keys/crt'], File['/var/lib/wpia-gigi/keys/csr'], Exec['/gigi-ready']]
+    require => [Package[$gigi_pkg], File['/var/lib/wpia-gigi/keys/crt'], File['/var/lib/wpia-gigi/keys/csr'], Exec['/gigi-ready']]
   }
   package{'cacert-cassiopeia':
     ensure => 'installed',

diff --git a/environments/production/manifests/ip.pp b/environments/production/manifests/ip.pp
index 3495a10f512fc5e49cfb71861bddb15e8bad5b94..8cc4856cf554686bc4044bbf5929ab837531cc7d 100644 (file)
--- a/environments/production/manifests/ip.pp
+++ b/environments/production/manifests/ip.pp
@@ -17,6 +17,8 @@ $passwords = {
    }
 }
 
+$testServer = 'false'
+
 $internet_iface = 'unknown'
 $systemDomain = 'unknown'
 $gigi_translation = 'unknown'

diff --git a/modules/gigi/templates/gigi.properties.epp b/modules/gigi/templates/gigi.properties.epp
index 8c127a818d566fdab72f70dfeb01bf4b8e931953..c0cc48b2e72c85702131944e93a6539b00f12e60 100644 (file)
--- a/modules/gigi/templates/gigi.properties.epp
+++ b/modules/gigi/templates/gigi.properties.epp
@@ -21,3 +21,8 @@ emailProvider.smtpHost=<%=$ips[exim]%>
 emailProvider.smtpPort=25
 
 highFinancialValue=blacklist.dat
+
+<% if($testServer == "true") { %>
+testing=true
+emailProvider=club.wpia.gigi.pages.Manager$MailFetcher
+<% } %>