X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=environments%2Fproduction%2Fmanifests%2Fgigi.pp;h=80bb50a5e50e9457760361838b718be64741dae6;hb=f341fae5472513454a68fe882b8800857192261d;hp=99ce28b0735d1fabb13e6c2210b52309e397e68b;hpb=4e7a747e9298faf3e78f523f4677a5838b621aa1;p=infra.git

diff --git a/environments/production/manifests/gigi.pp b/environments/production/manifests/gigi.pp
index 99ce28b..80bb50a 100644
--- a/environments/production/manifests/gigi.pp
+++ b/environments/production/manifests/gigi.pp
@@ -19,7 +19,6 @@ node gigi {
     unless => "/usr/bin/debconf-get-selections | /bin/grep -F '$gigi_translation' | /bin/grep -F '$gigi_pkg/fetch-locales'"
   }
 
-  class{'apt':}
   apt_key{ 'E643C483A426BB5311D26520A631B6AF9FD3DF94':
     source => 'http://deb.dogcraft.de/signer.gpg',
     ensure => 'present'
@@ -110,11 +109,12 @@ node gigi {
     require => [File['/var/lib/wpia-gigi'],Package[$gigi_pkg]]
   } -> service{'gigi-proxy.socket':
     ensure => 'running',
+    enable => true,
     provider => 'systemd',
     subscribe => [Exec['tar for gigi-conf'],File['/var/lib/wpia-gigi/config/profiles']],
     require => [Package[$gigi_pkg], File['/var/lib/wpia-gigi/keys/crt'], File['/var/lib/wpia-gigi/keys/csr'], Exec['/gigi-ready']]
   }
-  package{'cacert-cassiopeia':
+  package{'wpia-cassiopeia':
     ensure => 'installed',
     require => Exec['apt_update']
   }
@@ -124,13 +124,14 @@ if $signerLocation == 'self' {
     require => Exec['apt_update']
   }
   $cass_ip = $ips[cassiopeia]
-  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-client.service']
   }
@@ -143,7 +144,7 @@ if $signerLocation == 'self' {
 
   file {'/var/lib/cassiopeia/':
     ensure => 'directory',
-    require => Package['cacert-cassiopeia']
+    require => Package['wpia-cassiopeia']
   }
   file {'/var/lib/cassiopeia/config.txt':
     ensure => 'file',
@@ -183,7 +184,7 @@ if $signerLocation == 'self' {
     source => 'puppet:///modules/cassiopeia/signer_client.key'
   }
 
-  file { '/etc/systemd/system/cassiopeia-client.service':
+  systemd::unit_file { 'cassiopeia-client.service':
     source => 'puppet:///modules/gigi/cassiopeia-client.service',
     ensure => 'present'
   } ->
@@ -197,7 +198,8 @@ if $signerLocation == 'self' {
             File['/var/lib/cassiopeia/keys/signer_client.crt'],
             File['/var/lib/cassiopeia/keys/signer_client.key'],
             Exec['/gigi-ready']],
-    ensure => 'running'
+    ensure => 'running',
+    enable => true,
   }
 
 }