projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use hiera data for pulling health check data for security hosts
[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
457c558
..
c16870a
100644
(file)
--- a/
modules/roles/manifests/static_master.pp
+++ b/
modules/roles/manifests/static_master.pp
@@
-1,6
+1,6
@@
class roles::static_master {
class roles::static_master {
-
include roles::static_base
include roles::static_base
+ include roles::static_srvdir
file { '/usr/local/bin/static-master-run':
source => 'puppet:///modules/roles/static-mirroring/static-master-run',
file { '/usr/local/bin/static-master-run':
source => 'puppet:///modules/roles/static-mirroring/static-master-run',
@@
-14,6
+14,17
@@
class roles::static_master {
content => template('roles/static-mirroring/static-clients.conf.erb'),
}
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':
# export some information for the onion.debian.org build
if $::hostname in [dillon] {
file { '/srv/puppet.debian.org':
@@
-23,7
+34,13
@@
class roles::static_master {
ensure => directory
}
concat { '/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml':
ensure => directory
}
concat { '/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml':
+ notify => Exec["rebuild-onion-website"],
}
Concat::Fragment <<| tag == "onionbalance-services.yaml" |>>
}
Concat::Fragment <<| tag == "onionbalance-services.yaml" |>>
+
+ exec { 'rebuild-onion-website':
+ command => '/bin/su - staticsync -c \'make -C /srv/onion-master.debian.org\'',
+ refreshonly => true,
+ }
}
}
}
}