This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new f9576fe Comment ServerAlias entries
f9576fe is described below
commit f9576fedd3cdde5999d17f48fda48945d16d797b
Author: Sebb <[email protected]>
AuthorDate: Mon Jan 22 22:36:04 2018 +0000
Comment ServerAlias entries
---
config/whimsy.conf | 6 +++---
tools/mkconf.rb | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/config/whimsy.conf b/config/whimsy.conf
index a260591..bef5ceb 100644
--- a/config/whimsy.conf
+++ b/config/whimsy.conf
@@ -23,9 +23,9 @@
CustomLog "/var/log/apache2/whimsy_access.log" combined
## Server aliases
- ServerAlias whimsy-test.apache.org
- ServerAlias whimsy4.apache.org
- ServerAlias whimsy-vm4.apache.org
+ ## ServerAlias whimsy-test.apache.org
+ ## ServerAlias whimsy4.apache.org
+ ## ServerAlias whimsy-vm4.apache.org
## Custom fragment
diff --git a/tools/mkconf.rb b/tools/mkconf.rb
index 5a9f32d..3d5291e 100644
--- a/tools/mkconf.rb
+++ b/tools/mkconf.rb
@@ -17,6 +17,8 @@ end
conf.sub! 'VirtualHost *:443', 'VirtualHost *:80'
conf.sub! 'ServerName whimsy.apache.org', 'ServerName whimsy.local'
+conf.gsub! 'ServerAlias', '## ServerAlias'
+
conf.gsub! /(\A|\n)\s*RemoteIPHeader.*/, ''
conf.gsub! /\n\s*PassengerDefault.*/, ''
--
To stop receiving notification emails like this one, please contact
[email protected].
