I wish to destroy the openhw2012 app and turn it into a static page (which we need to have public for the next 6 months).

I have the static version of the page staged in my local fedora-web repos under 'fedora-web/fedoraproject.org/static/openhw2012'. Once approved, I will push that and make the following change to puppet that removes the openhw2012 module, node, and redirect.

Once that is complete, the new static page should theoretically Just Work, and we can then destroy the openhw2012 VM.

luke

--- a/manifests/nodes/openhw2012.phx2.fedoraproject.org.pp +++ /dev/null @@ -1,35 +0,0 @@ -node "openhw2012.phx2.fedoraproject.org" { - $fas_groups = [ 'sysadmin-main', 'sysadmin-noc' , 'fi-apprentice', 'sysadmin-web' ] - include global - include fas::client - include phx - include selinux-enforcing - include httpd::app - include openvpn::client - - eth { 'eth0': - ipaddr => '10.5.126.44', - netmask => '255.255.255.0', - } - - iptables::firewall { 'ipv4': - tcpPorts => [ 80, 443, 6996 ] - } - - selboolean { [ - "httpd_tmp_exec", - "httpd_can_network_connect_db", - "httpd_can_sendmail", - "httpd_can_network_connect", - "httpd_read_user_content", - ]: - persistent => true, - value => on, - } - - semanage_fcontext { [ - "/srv/web/openhw2012/data(/.*)?", - ]: - type => "httpd_sys_rw_content_t", - } -} diff --git a/manifests/services/proxy.pp b/manifests/services/proxy.pp index ba72022..b2143eb 100644 --- a/manifests/services/proxy.pp +++ b/manifests/services/proxy.pp @@ -580,12 +580,6 @@ class proxy { path => "/fedmsg", }

- openhw2012::proxy { "fedoraproject.org/openhw2012": - website => "fedoraproject.org", - path => "/openhw2012", - proxyurl => "http://openhw2012", - } - review-stats::proxy { "fedoraproject.org/PackageReviewStatus": website => "fedoraproject.org", path => "/PackageReviewStatus", diff --git a/modules-staging/haproxy/files/haproxy.cfg b/modules-staging/haproxy/files/haproxy.cfg index 89dc039..8d3abd0 100644 --- a/modules-staging/haproxy/files/haproxy.cfg +++ b/modules-staging/haproxy/files/haproxy.cfg @@ -192,11 +192,6 @@ listen tagger 0.0.0.0:10017 server packages02 packages02:80 check inter 5s rise 2 fall 3 option httpchk GET /tagger/_heartbeat

-#listen openhw2012 0.0.0.0:10018 -# balance hdr(appserver) -# server openhw2012 openhw2012:80 check inter 5s rise 2 fall 3 -# option httpchk GET /openhw2012/accept - #listen membership-map 0.0.0.0:10001 # balance hdr(appserver) # server app1 app1:80 check inter 5s rise 2 fall 3 diff --git a/modules/haproxy/files/haproxy.cfg b/modules/haproxy/files/haproxy.cfg index 89dc039..8d3abd0 100644 --- a/modules/haproxy/files/haproxy.cfg +++ b/modules/haproxy/files/haproxy.cfg @@ -192,11 +192,6 @@ listen tagger 0.0.0.0:10017 server packages02 packages02:80 check inter 5s rise 2 fall 3 option httpchk GET /tagger/_heartbeat

-#listen openhw2012 0.0.0.0:10018 -# balance hdr(appserver) -# server openhw2012 openhw2012:80 check inter 5s rise 2 fall 3 -# option httpchk GET /openhw2012/accept - #listen membership-map 0.0.0.0:10001 # balance hdr(appserver) # server app1 app1:80 check inter 5s rise 2 fall 3 diff --git a/modules/openhw2012/manifests/init.pp b/modules/openhw2012/manifests/init.pp deleted file mode 100644 index 17939e4..0000000 --- a/modules/openhw2012/manifests/init.pp +++ /dev/null @@ -1,17 +0,0 @@ -define openhw2012::proxy( - $website, - $path, - $proxyurl -) { - include httpd::base - - file { "/etc/httpd/conf.d/$website/openhw2012.conf": - owner => "root", - group => "root", - mode => 0644, - notify => Service["httpd"], - content => template("openhw2012/openhw2012-proxy.conf.erb"), - require => Httpd::Website[$website], - } -} - diff --git a/modules/openhw2012/templates/openhw2012-proxy.conf.erb b/modules/openhw2012/templates/openhw2012-proxy.conf.erb deleted file mode 100644 index de49a5a..0000000 --- a/modules/openhw2012/templates/openhw2012-proxy.conf.erb +++ /dev/null @@ -1,4 +0,0 @@ -RewriteEngine On - -ProxyPass <%= path %> <%= proxyurl %>/openhw2012 -ProxyPassReverse <%= path %> <%= proxyurl %>/openhw2012