fix: correctly auto-start cassiopeia services

[infra.git] / environments / production / manifests / site.pp

diff --git a/environments/production/manifests/site.pp b/environments/production/manifests/site.pp
index 17e46d7da9b24e5eaebe03c094faf92f06b8efda..4e227820a05d27c138164ab5d4c6d3363f303c17 100644 (file)
--- 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,7 +31,7 @@ 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']
@@ -93,7 +99,7 @@ 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',
   }->
@@ -102,7 +108,7 @@ if $signerLocation == 'self' {
     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'],