X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=environments%2Fproduction%2Fmanifests%2Fsite.pp;h=4e227820a05d27c138164ab5d4c6d3363f303c17;hb=95266f6237df2334741f3ce60050618259452ed4;hp=ad68ec3aca3dcb9801d7b06b6bd8c5b2559a5ab9;hpb=417ce970216bcb6221d2e7335e89c65083cdecc5;p=infra.git

diff --git a/environments/production/manifests/site.pp b/environments/production/manifests/site.pp
index ad68ec3..4e22782 100644
--- a/environments/production/manifests/site.pp
+++ b/environments/production/manifests/site.pp
@@ -1,3 +1,10 @@
+class { 'apt':
+  update => {
+    frequency => 'daily',
+  },
+}
+Exec["apt_update"] -> Package <| |>
+
 node  cassiopeia {
   include container::contained
 if $signerLocation == 'self' {
@@ -5,9 +12,8 @@ if $signerLocation == 'self' {
 } else {
   include container::ssh
 }
-  class{'apt':}
   apt_key{ 'E643C483A426BB5311D26520A631B6AF9FD3DF94':
-    source => 'http://deb.dogcraft.de/signer.gpg',
+    source => 'http://deb2.dogcraft.de/signer.gpg',
     ensure => 'present'
   } ->
   file { '/etc/apt/sources.list.d/dogcraft.list':
@@ -15,7 +21,7 @@ if $signerLocation == 'self' {
     ensure => 'present',
     notify => Exec['apt_update']
   } ->
-  package { 'cacert-cassiopeia-signer':
+  package { 'wpia-cassiopeia-signer':
     ensure => 'installed',
     require => Exec['apt_update']
   }
@@ -25,13 +31,14 @@ if $signerLocation == 'self' {
     require => Exec['apt_update']
   }
   $cass_ip='';
-  file {'/etc/systemd/system/tcpserial.service':
+  systemd::unit_file {'tcpserial.service':
     ensure => 'file',
     content => epp('gigi/tcpserial'),
     require => Package['tcpserial']
   }->
   service{'tcpserial.service':
     ensure => 'running',
+    enable => true,
     provider => 'systemd',
     before => Service['cassiopeia-signer.service']
   }
@@ -92,15 +99,16 @@ if $signerLocation == 'self' {
     content => epp('gigi/cassiopeia-client-conf'),
   }
 
-  file {'/etc/systemd/system/cassiopeia-signer.service':
+  systemd::unit_file {'cassiopeia-signer.service':
     ensure => 'file',
     source => 'puppet:///modules/gigi/cassiopeia-signer.service',
   }->
   service{'cassiopeia-signer.service':
     ensure => 'running',
+    enable => true,
     provider => 'systemd',
     require => [Exec['/usr/bin/openssl dhparam -out dh_param.pem 2048'],
-                Package['cacert-cassiopeia-signer'],
+                Package['wpia-cassiopeia-signer'],
                 File['/var/lib/cassiopeia/logs'],
                 File['/var/lib/cassiopeia/profiles'],
                 File['/var/lib/cassiopeia/ca'],
@@ -119,5 +127,18 @@ node exim{
 
   package{ 'exim4-daemon-light':
     ensure => 'installed'
+  } ->
+  file{ '/etc/exim4/update-exim4.conf.conf':
+    ensure => 'file',
+    content => epp('exim/update-exim4.conf.conf'),
+    notify => Exec['/usr/sbin/update-exim4.conf']
+  }
+  exec{ '/usr/sbin/update-exim4.conf':
+    refreshonly => 'true',
+    notify => Service['exim4']
+  }
+  service{ 'exim4':
+    ensure => 'running',
+    enable => true,
   }
 }