diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-11 22:30:30 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-11 22:30:30 +0000 |
| commit | f2e7fbae5c03392024bb5717d82071b89b0edcef (patch) | |
| tree | b53a00a3904d1c1cf36d19568cc10da0ff21d87b /deployment/websites | |
| parent | 79c8d9e5e002cb70e27ebcf4922b17e8e8be419a (diff) | |
| download | puppet-f2e7fbae5c03392024bb5717d82071b89b0edcef.tar puppet-f2e7fbae5c03392024bb5717d82071b89b0edcef.tar.gz puppet-f2e7fbae5c03392024bb5717d82071b89b0edcef.tar.bz2 puppet-f2e7fbae5c03392024bb5717d82071b89b0edcef.tar.xz puppet-f2e7fbae5c03392024bb5717d82071b89b0edcef.zip | |
Remove websites::maintenance
Diffstat (limited to 'deployment/websites')
| -rw-r--r-- | deployment/websites/files/maintenance.html | 13 | ||||
| -rw-r--r-- | deployment/websites/manifests/maintenance.pp | 22 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_maintenance.conf | 77 |
3 files changed, 0 insertions, 112 deletions
diff --git a/deployment/websites/files/maintenance.html b/deployment/websites/files/maintenance.html deleted file mode 100644 index 5a2c3a7c..00000000 --- a/deployment/websites/files/maintenance.html +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> - <head> - <title>Website under maintenance</title> - <link rel="stylesheet" href="css/site.css" type="text/css" /> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - </head> - <body> - Website under maintenance. - See <a href="http://blog.mageia.org/en/2013/05/03/planned-maintenance-on-mageia-servers-this-weekend/">this page</a> for more details. - </body> -</html> diff --git a/deployment/websites/manifests/maintenance.pp b/deployment/websites/manifests/maintenance.pp deleted file mode 100644 index f05153a9..00000000 --- a/deployment/websites/manifests/maintenance.pp +++ /dev/null @@ -1,22 +0,0 @@ -class websites::maintenance { - $vhostdir = "$websites::base::webdatadir/maintenance" - - file {$vhostdir: - ensure => 'directory', - mode => '0755', - owner => 'root', - group => 'root', - } - - file {"$vhostdir/index.html": - ensure => 'present', - mode => '0644', - owner => 'root', - group => 'root', - source => 'puppet:///modules/websites/maintenance.html', - } - - apache::vhost::other_app { "maintenance.$::domain": - vhost_file => 'websites/vhost_maintenance.conf', - } -} diff --git a/deployment/websites/templates/vhost_maintenance.conf b/deployment/websites/templates/vhost_maintenance.conf deleted file mode 100644 index 8debf4b4..00000000 --- a/deployment/websites/templates/vhost_maintenance.conf +++ /dev/null @@ -1,77 +0,0 @@ -<VirtualHost *:80> - ServerName maintenance.mageia.org - ServerAlias identity.mageia.org - ServerAlias identity-trunk.mageia.org - ServerAlias epoll.mageia.org - ServerAlias bugs.mageia.org - ServerAlias svnweb.mageia.org - ServerAlias xymon.mageia.org - ServerAlias check.mageia.org - ServerAlias wiki.mageia.org - ServerAlias gitweb.mageia.org - ServerAlias pkgcpan.mageia.org - ServerAlias perl.mageia.org - ServerAlias tmp.mageia.org - ServerAlias people.mageia.org - ServerAlias forums.mageia.org - ServerAlias forum.mageia.org - - DocumentRoot <%= vhostdir %> - CustomLog /var/log/httpd/maintenanc_log combined - ErrorLog /var/log/httpd/error_maintenance_log - - <Location /> - Allow from all - </Location> - - <Directory <%= vhostdir %>> - Order deny,allow - Allow from All - AllowOverride None - </Directory> - - RewriteEngine On - RewriteRule .* <%= vhostdir %>/index.html [L] -</VirtualHost> - -<VirtualHost *:443> - SSLEngine on - SSLCertificateFile /etc/ssl/wildcard.mageia.org.crt - SSLCertificateKeyFile /etc/ssl/wildcard.mageia.org.key - SSLCACertificateFile /etc/ssl/wildcard.mageia.org.pem - SSLVerifyClient None - - ServerName maintenance.mageia.org - ServerAlias identity.mageia.org - ServerAlias identity-trunk.mageia.org - ServerAlias epoll.mageia.org - ServerAlias bugs.mageia.org - ServerAlias svnweb.mageia.org - ServerAlias xymon.mageia.org - ServerAlias check.mageia.org - ServerAlias wiki.mageia.org - ServerAlias gitweb.mageia.org - ServerAlias pkgcpan.mageia.org - ServerAlias perl.mageia.org - ServerAlias tmp.mageia.org - ServerAlias people.mageia.org - ServerAlias forums.mageia.org - ServerAlias forum.mageia.org - - DocumentRoot <%= vhostdir %> - CustomLog /var/log/httpd/maintenanc_log combined - ErrorLog /var/log/httpd/error_maintenance_log - - <Location /> - Allow from all - </Location> - - <Directory <%= vhostdir %>> - Order deny,allow - Allow from All - AllowOverride None - </Directory> - - RewriteEngine On - RewriteRule .* <%= vhostdir %>/index.html [L] -</VirtualHost> |