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 ae41575c Tidy up
ae41575c is described below
commit ae41575cac650ad061ff4e93200e9eda6acd4fd9
Author: Sebb <[email protected]>
AuthorDate: Fri Jan 19 14:58:25 2024 +0000
Tidy up
---
tools/mkconf.rb | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/tools/mkconf.rb b/tools/mkconf.rb
index ef27d662..a7178a50 100755
--- a/tools/mkconf.rb
+++ b/tools/mkconf.rb
@@ -22,6 +22,12 @@ conf = <<-EOF + conf
#
EOF
+conf.sub! 'SetEnv HOME /var/www',"""SetEnv HOME /var/www
+
+# to agree with Dockerfile (ensure svn does not complain)
+SetEnv LANG C.UTF-8
+SetEnv LC_ALL C.UTF-8"""
+
conf.sub! 'VirtualHost *:443', 'VirtualHost *:80'
conf.sub! /ServerName whimsy(.*?)\.apache\.org/, 'ServerName whimsy.local'
@@ -51,8 +57,7 @@ conf.gsub! /AuthLDAPUrl .*/, 'AuthLDAPUrl "ldaps://<%=
ldaphosts %>/ou=people,dc
conf.gsub! /AuthLDAPBindDN .*/, 'AuthLDAPBindDN <%= ldapbinddn %>'
conf.gsub! /AuthLDAPBindPassword .*/, 'AuthLDAPBindPassword "<%= ldapbindpw
%>"'
-appendix="""
-# Needs libapache2-mod-svn to be installed
+appendix="""# Needs libapache2-mod-svn to be installed
# These are separate repos, as per the real ones
<Location /repos/asf>
DAV svn
@@ -72,11 +77,12 @@ appendix="""
SetOutputFilter DEFLATE
</Location>
-</VirtualHost>
-"""
+</VirtualHost>"""
conf.sub! '</VirtualHost>', appendix
+conf.gsub! %r{ $}, "" # Trailing spaces
+
if ARGV.empty?
puts conf
else
