Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/60612


Change subject: delete outdated apache configs for outreachcivi (RT-5002) and 
ocs.wikimania2009 they still resolve(d) to singer, but they were not enabled 
apache sites anyways
......................................................................

delete outdated apache configs for outreachcivi (RT-5002) and ocs.wikimania2009
they still resolve(d) to singer, but they were not enabled apache sites
anyways

Change-Id: I7189543552db0f93349bc8da0cf074e9a0f9ab3c
---
D files/apache/sites/ocs.wikimania2009.wikimedia.org
D files/apache/sites/outreachcivi.wikimedia.org
2 files changed, 0 insertions(+), 119 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/60612/1

diff --git a/files/apache/sites/ocs.wikimania2009.wikimedia.org 
b/files/apache/sites/ocs.wikimania2009.wikimedia.org
deleted file mode 100644
index f0b4100..0000000
--- a/files/apache/sites/ocs.wikimania2009.wikimedia.org
+++ /dev/null
@@ -1,59 +0,0 @@
-<VirtualHost *:80>
-       ServerAdmin n...@wikimedia.org
-       ServerName ocs.wikimania2009.wikimedia.org
-
-       DocumentRoot /srv/org/wikimedia/wikimania2009/ocs/
-       <Directory />
-               Options FollowSymLinks
-               AllowOverride None
-       </Directory>
-       <Directory /srv/org/wikimedia/wikimania2009/ocs/>
-               Options Indexes FollowSymLinks MultiViews
-               AllowOverride None
-               Order allow,deny
-               allow from all
-
-       </Directory>
-
-       ErrorLog /var/log/apache2/error.log
-
-       # Possible values include: debug, info, notice, warn, error, crit,
-       # alert, emerg.
-       LogLevel warn
-
-       CustomLog /var/log/apache2/access.log combined
-       ServerSignature On
-
-</VirtualHost>
-
-<VirtualHost *:443>
-       ServerAdmin n...@wikimedia.org
-       ServerName ocs.wikimania2009.wikimedia.org
-
-       SSLEngine on
-       SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-       SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
-
-       DocumentRoot /srv/org/wikimedia/wikimania2009/ocs/
-       <Directory />
-               Options FollowSymLinks
-               AllowOverride None
-       </Directory>
-       <Directory /srv/org/wikimedia/wikimania2009/ocs/>
-               Options Indexes FollowSymLinks MultiViews
-               AllowOverride None
-               Order allow,deny
-               allow from all
-
-       </Directory>
-
-       ErrorLog /var/log/apache2/error.log
-
-       # Possible values include: debug, info, notice, warn, error, crit,
-       # alert, emerg.
-       LogLevel warn
-
-       CustomLog /var/log/apache2/access.log combined
-       ServerSignature On
-
-</VirtualHost>
diff --git a/files/apache/sites/outreachcivi.wikimedia.org 
b/files/apache/sites/outreachcivi.wikimedia.org
deleted file mode 100644
index 1d85cc7..0000000
--- a/files/apache/sites/outreachcivi.wikimedia.org
+++ /dev/null
@@ -1,60 +0,0 @@
-<VirtualHost outreachcivi.wikimedia.org:80>
-       ServerAdmin n...@wikimedia.org
-       ServerName outreachcivi.wikimedia.org
-
-       Redirect / https://outreachcivi.wikimedia.org/
-
-</VirtualHost>
-
-NameVirtualHost outreachcivi.wikimedia.org:443
-
-<VirtualHost outreachcivi.wikimedia.org:443>
-       ServerAdmin n...@wikimedia.org
-       ServerName outreachcivi.wikimedia.org
-
-       DocumentRoot /srv/org/wikimedia/outreachcivi/
-       SSLEngine On
-       SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-       SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
-       <Directory />
-               Options FollowSymLinks
-               AllowOverride None
-       </Directory>
-       <Directory /srv/org/wikimedia/outreachcivi/>
-               Options Indexes FollowSymLinks MultiViews
-               # AllowOverride None
-               AllowOverride All
-               Order allow,deny
-               allow from all
-               # This directive allows us to have apache2's default start page
-               # in /apache2-default/, but still have / go to the right place
-               #RedirectMatch ^/$ /apache2-default/
-       </Directory>
-
-       ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-       <Directory "/usr/lib/cgi-bin">
-               AllowOverride None
-               Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
-               Order allow,deny
-               Allow from all
-       </Directory>
-
-       ErrorLog /var/log/apache2/error.log
-
-       # Possible values include: debug, info, notice, warn, error, crit,
-       # alert, emerg.
-       LogLevel warn
-
-       CustomLog /var/log/apache2/access.log combined
-       ServerSignature On
-
-       Alias /doc/ "/usr/share/doc/"
-       <Directory "/usr/share/doc/">
-               Options Indexes MultiViews FollowSymLinks
-               AllowOverride None
-               Order deny,allow
-               Deny from all
-               Allow from 127.0.0.0/255.0.0.0 ::1/128
-       </Directory>
-
-</VirtualHost>

-- 
To view, visit https://gerrit.wikimedia.org/r/60612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7189543552db0f93349bc8da0cf074e9a0f9ab3c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to