X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fstatic-mirroring.creole;h=b2c9dc0eb09a6d1fe297a11e526ca7d2a2e0aafc;hb=247201bba87cd96b68df4311314a1b857450b547;hp=8942a3d58148630d2bc4328bd286317d92244478;hpb=a494b54d7442ffa4f158925042ed1d4b8ed50fc7;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/static-mirroring.creole b/input/howto/static-mirroring.creole
index 8942a3d..b2c9dc0 100644
--- 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,7 +50,7 @@ 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}}} and {{{roles::static_mirror_nopush}}} to the {{{classes}}} stanza in {{{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.