X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=blobdiff_plain;f=input%2Fhowto%2Fstatic-mirroring.creole;fp=input%2Fhowto%2Fstatic-mirroring.creole;h=2eb9efeb99153f903af9783d1eeb387eabc28762;hp=302be35b3964ac7abf6cb2a98ea7572626f8c1d3;hb=2b35c4581f6e2a72baf420b6dbb0d87a5b33b217;hpb=0b1b2918c1666975712845972456dc24ec9bc842

diff --git a/input/howto/static-mirroring.creole b/input/howto/static-mirroring.creole
index 302be35..2eb9efe 100644
--- a/input/howto/static-mirroring.creole
+++ b/input/howto/static-mirroring.creole
@@ -13,10 +13,11 @@ Using already configured source and master hosts.
 
 * Pick a component name, e.g., {{{debaday.debian.net}}}
 
-* Pick/Learn source host, pick a master, and add to {{{dsa-puppet/modules/roles/files/static-mirroring/static-components.conf}}}:
+* Pick/Learn source host, pick a master, and add to {{{dsa-puppet/modules/roles/misc/static-components.yaml}}}:
 {{{
-	# <master>              <service>                       <source host>                   <directory>                             <extra push hosts, comma separated>
-	dillon.debian.org       debaday.debian.net              dillon.debian.org               /srv/debaday.debian.net/htdocs
+       debaday.debian.net:
+         master: static-master-manda-01.debian.org
+         source: dillon.debian.org:/srv/debaday.debian.net/htdocs
 }}}
 
 * Give sudo to run the right {{{static-update-component}}} to the appropriate group:
@@ -29,11 +30,17 @@ 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
 {{{
-	vi dsa-puppet/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+	vhost(lines, "debaday.debian.net"            , :ssl => true)
+}}}
+** 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, }
 }}}
 
-* run puppet on the master, the source, and all the mirrors.  Check {{{dsa-puppet/hieradata/common.yaml}}}.
+* run puppet on the master, the source, and all the mirrors.  Check {{{dsa-puppet/nodes/*.yaml}}}.
 
 == Adding a mirror