howto/static-mirroring: static_mirror_nopush -> get_triggered:false

[mirror/dsa-wiki.git] / input / howto / static-mirroring.creole

diff --git a/input/howto/static-mirroring.creole b/input/howto/static-mirroring.creole
index 8942a3d..f6d2b5c 100644 (file)
--- a/input/howto/static-mirroring.creole
+++ b/input/howto/static-mirroring.creole
@@ -22,7 +22,7 @@ Using already configured source and master hosts.
 
 * Give sudo to run the right {{{static-update-component}}} to the appropriate group:
 {{{
-       /usr/sbin/visudo -f dsa-puppet/modules/sudo/files/sudoer
+       /usr/sbin/visudo -f dsa-puppet/modules/sudo/files/sudoers
 }}}
 and add something like
 {{{
@@ -32,9 +32,13 @@ and add something like
 * Add the vhost config on mirrors:
 ** vi {{{dsa-puppet/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb}}}
 and add
-{{{
-       vhost(lines, "debaday.debian.net"            , :ssl => true)
-}}}
+<pre>
+  vhost(lines, "debaday.debian.net"            , :ssl => true
+</pre>
+and
+<pre>
+  onion::service { 'debaday.debian.net'            : ensure => 'ifstatic', port => 80, target_port => 80, target_address => $onion_addr }
+</pre>
 ** In {{{dsa-puppet/modules/roles/manifests/static_mirror_web.pp}}}, add:
 {{{
        ssl::service { 'debaday.debian.net'            : ensure => 'ifstatic', notify  => Exec['service apache2 reload'], key => true, }
@@ -46,13 +50,14 @@ and add
 
 Note:  This might temporarily break apache on the new mirror host.
 
-* Add host to {{{static_mirror}}} and {{{static_mirror_nopush}}} in {{{hieradata/common.yaml}}}.
+* Add {{{roles::static_mirror}}} to the {{{classes}}} stanza in {{{data/nodes/$HOSTNAME.yaml}}}.
+* Add {{{staticsync::static_mirror::get_triggered: false}}} to {{{data/nodes/$HOSTNAME.yaml}}}.
 * Add {{{staticsync}}} group to host's {{{allowedGroups}}} attribute in ldap.
 * Run puppet twice on new static mirror once staticsync exists.
 * Run puppet on static masters.
 * On the static mirror: {{{install -d -o staticsync -g staticsync -m 02755 /srv/static.debian.org}}}.
 * Run the command from {{{/etc/cron.d/puppet-static-mirror}}} on the mirror.
 * Make sure apache works on the mirror.  This might require deploying SSL keys.
-* Remove mirror from {{{static_mirror_nopush}}}.
+* Remove {{{staticsync::static_mirror::get_triggered: false}}} from {{{data/nodes/$HOSTNAME.yaml}}}.
 * Run puppet on static masters.
 * Rotate mirror.