port 6081 should be allowed via snapshot

[mirror/dsa-puppet.git] / modules / roles / manifests / static_master.pp

diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index 6750aa6..c16870a 100644 (file)
--- a/modules/roles/manifests/static_master.pp
+++ b/modules/roles/manifests/static_master.pp
@@ -1,22 +1,46 @@
-class roles::static_master inherits roles::mirror_base {
-    file {
-        '/etc/ssh/userkeys/staticsync':
-            content => template('roles/static-master-authorized_keys.erb'),
-            ;
-        '/usr/local/bin/static-master-run':
-            source  => "puppet:///modules/roles/static-mirroring/static-master-run",
-            mode => 555,
-            ;
-        '/usr/local/bin/static-master-ssh-wrap':
-            source  => "puppet:///modules/roles/static-mirroring/static-master-ssh-wrap",
-            mode => 555,
-            ;
-        '/usr/local/bin/static-master-update-component':
-            source  => "puppet:///modules/roles/static-mirroring/static-master-update-component",
-            mode => 555,
-            ;
-    }
+class roles::static_master {
+       include roles::static_base
+       include roles::static_srvdir
+
+       file { '/usr/local/bin/static-master-run':
+               source => 'puppet:///modules/roles/static-mirroring/static-master-run',
+               mode   => '0555',
+       }
+       file { '/usr/local/bin/static-master-update-component':
+               source => 'puppet:///modules/roles/static-mirroring/static-master-update-component',
+               mode   => '0555',
+       }
+       file { '/etc/static-clients.conf':
+               content => template('roles/static-mirroring/static-clients.conf.erb'),
+       }
+
+       file { "/home/staticsync/static-master":
+               ensure => link,
+               target => '/srv/static.debian.org',
+       }
+       file { '/srv/static.debian.org/master':
+               ensure => directory,
+               mode   => '0755',
+               owner  => 'staticsync',
+               group  => 'staticsync',
+       }
+
+       # export some information for the onion.debian.org build
+       if $::hostname in [dillon] {
+               file { '/srv/puppet.debian.org':
+                       ensure => directory
+               }
+               file { '/srv/puppet.debian.org/puppet-facts':
+                       ensure => directory
+               }
+               concat { '/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml':
+                       notify  => Exec["rebuild-onion-website"],
+               }
+               Concat::Fragment <<| tag == "onionbalance-services.yaml" |>>
+
+               exec { 'rebuild-onion-website':
+                       command => '/bin/su - staticsync -c \'make -C /srv/onion-master.debian.org\'',
+                       refreshonly => true,
+               }
+       }
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: