whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: recommend a symbolic link to /srv/whimsy; regen whimsy.conf file
Date Mon, 12 Jun 2017 22:33:02 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys 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 4d85c09  recommend a symbolic link to /srv/whimsy; regen whimsy.conf file
     new 8b01880  Merge branch 'master' of github.com:apache/whimsy
4d85c09 is described below

commit 4d85c0994596f1eb3be5ec272997020005894a2d
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Mon Jun 12 18:32:06 2017 -0400

    recommend a symbolic link to /srv/whimsy; regen whimsy.conf file
---
 MACOSX.md          | 10 +++++--
 config/whimsy.conf | 81 +++++++++++++++++++-----------------------------------
 tools/mkconf.rb    |  2 +-
 3 files changed, 37 insertions(+), 56 deletions(-)

diff --git a/MACOSX.md b/MACOSX.md
index 645bb25..64065a3 100644
--- a/MACOSX.md
+++ b/MACOSX.md
@@ -322,14 +322,18 @@ Add the following line:
 LDAPVerifyServerCert Off
 ```
 
-Copy whimsy vhost definition to your apache2 configuration (from the root of your whimsy
git checkout):
+Copy whimsy vhost definition to your apache2 configuration (from the root of your whimsy
git clone):
 
 ```
 sudo cp config/whimsy.conf /private/etc/apache2/other
 ```
 
-Edit `/private/etc/apache2/other/whimsy.conf` and replace all occurrences of
-`/Users/rubys/git/whimsy` with the path that you cloned whimsy.
+Also from the root of your whimsy git checkout, establish a symbolic link to your whimsy
git clone directory:
+
+```
+sudo mkdir -p /srv
+sudo ln -s `pwd` /srv/whimsy
+```
 
 Restart Apache httpd using `sudo apachectl restart`.
 
diff --git a/config/whimsy.conf b/config/whimsy.conf
index e1bfe4d..23be6dd 100644
--- a/config/whimsy.conf
+++ b/config/whimsy.conf
@@ -7,11 +7,11 @@
   ServerName whimsy.local
 
   ## Vhost docroot
-  DocumentRoot "/Users/rubys/git/whimsy/www"
+  DocumentRoot "/srv/whimsy/www"
 
-  ## Directories, there should at least be a declaration for /Users/rubys/git/whimsy/www
+  ## Directories, there should at least be a declaration for /srv/whimsy/www
 
-  <Directory "/Users/rubys/git/whimsy/www">
+  <Directory "/srv/whimsy/www">
     Options +FollowSymLinks +MultiViews +ExecCGI
     AllowOverride None
     Require all granted
@@ -41,22 +41,22 @@ ExpiresActive On
   ExpiresByType application/javascript "access plus 1 month"
 </If>
 
-<Directory /Users/rubys/git/whimsy/www/>
+<Directory /srv/whimsy/www/>
   AddHandler cgi-script .cgi
   MultiViewsMatch Any
   CheckSpelling On
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/public/>
+<Directory /srv/whimsy/www/public/>
   Header add Access-Control-Allow-Origin "*"
   Options +Indexes
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/logs>
+<Directory /srv/whimsy/www/logs>
   Options +Indexes
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/members/log>
+<Directory /srv/whimsy/www/members/log>
   Options +Indexes
 </Directory>
 
@@ -66,9 +66,6 @@ RewriteRule ^.*$ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 # for secretary workbench
 RedirectMatch permanent ^/secmail /secretary/workbench
 
-RedirectMatch ^/classic/roster/committee$ https://whimsy.apache.org/classic/roster/committee/
-RedirectMatch ^/classic/roster/committer$ https://whimsy.apache.org/classic/roster/committer/
-
 RedirectMatch ^/officers/mlreq(/.*)?$ https://infra.apache.org/officers/mlreq$1
 
 RedirectMatch ^/officers/public_names https://whimsy.apache.org/secretary/public-names
@@ -79,51 +76,51 @@ ErrorDocument 401 /401.html
 ErrorDocument 404 /404.html
 ErrorDocument 500 /500.html
 
-Alias /board/agenda/ /Users/rubys/git/whimsy/www/board/agenda/public
+Alias /board/agenda/ /srv/whimsy/www/board/agenda/public
 
 <Location /board/agenda>
 PassengerBaseURI /board/agenda
-  PassengerAppRoot /Users/rubys/git/whimsy/www/board/agenda
+  PassengerAppRoot /srv/whimsy/www/board/agenda
   Options -MultiViews
   CheckSpelling Off
   # SetEnv HTTPS on
 </Location>
 
-Alias /racktest/ /Users/rubys/git/whimsy/www/racktest/public
+Alias /racktest/ /srv/whimsy/www/racktest/public
 
 <Location /racktest>
 PassengerBaseURI /racktest
-  PassengerAppRoot /Users/rubys/git/whimsy/www/racktest
+  PassengerAppRoot /srv/whimsy/www/racktest
   Options -MultiViews
   CheckSpelling Off
   # SetEnv HTTPS on
 </Location>
 
-Alias /roster/ /Users/rubys/git/whimsy/www/roster/public
+Alias /roster/ /srv/whimsy/www/roster/public
 
 <Location /roster>
 PassengerBaseURI /roster
-  PassengerAppRoot /Users/rubys/git/whimsy/www/roster
+  PassengerAppRoot /srv/whimsy/www/roster
   Options -MultiViews
   CheckSpelling Off
   # SetEnv HTTPS on
 </Location>
 
-Alias /secretary/workbench/ /Users/rubys/git/whimsy/www/secretary/workbench/public
+Alias /secretary/workbench/ /srv/whimsy/www/secretary/workbench/public
 
 <Location /secretary/workbench>
 PassengerBaseURI /secretary/workbench
-  PassengerAppRoot /Users/rubys/git/whimsy/www/secretary/workbench
+  PassengerAppRoot /srv/whimsy/www/secretary/workbench
   Options -MultiViews
   CheckSpelling Off
   # SetEnv HTTPS on
 </Location>
 
-Alias /test/icla/ /Users/rubys/git/whimsy/www/test/icla/public
+Alias /test/icla/ /srv/whimsy/www/test/icla/public
 
 <Location /test/icla>
 PassengerBaseURI /test/icla
-  PassengerAppRoot /Users/rubys/git/whimsy/www/test/icla
+  PassengerAppRoot /srv/whimsy/www/test/icla
   Options -MultiViews
   CheckSpelling Off
   # SetEnv HTTPS on
@@ -139,17 +136,7 @@ AuthType Basic
   Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
 </LocationMatch>
 
-<Directory /Users/rubys/git/whimsy/www/classic/roster>
-AuthType Basic
-  AuthName "ASF Committers"
-  AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
-  AuthLDAPGroupAttribute memberUid
-  AuthLDAPGroupAttributeIsDN off
-  Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
-</Directory>
-
-<Directory /Users/rubys/git/whimsy/www/committers>
+<Directory /srv/whimsy/www/committers>
 AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
@@ -159,7 +146,7 @@ AuthType Basic
   Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/test/icla>
+<Directory /srv/whimsy/www/test/icla>
 AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
@@ -169,7 +156,7 @@ AuthType Basic
   Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/roster>
+<Directory /srv/whimsy/www/roster>
 AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
@@ -179,7 +166,7 @@ AuthType Basic
   Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/test/roster>
+<Directory /srv/whimsy/www/test/roster>
 AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
@@ -209,17 +196,7 @@ AuthType Basic
   Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
 </LocationMatch>
 
-<Directory /Users/rubys/git/whimsy/www/board/agenda>
-AuthType Basic
-  AuthName "ASF Members and Officers"
-  AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
-  AuthLDAPGroupAttribute memberUid
-  AuthLDAPGroupAttributeIsDN off
-  Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
-</Directory>
-
-<Directory /Users/rubys/git/whimsy/www/classic/board/agenda>
+<Directory /srv/whimsy/www/board/agenda>
 AuthType Basic
   AuthName "ASF Members and Officers"
   AuthBasicProvider ldap
@@ -229,7 +206,7 @@ AuthType Basic
   Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/fundraising>
+<Directory /srv/whimsy/www/fundraising>
 AuthType Basic
   AuthName "ASF Members and Officers"
   AuthBasicProvider ldap
@@ -239,7 +216,7 @@ AuthType Basic
   Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/officers>
+<Directory /srv/whimsy/www/officers>
 AuthType Basic
   AuthName "ASF Members and Officers"
   AuthBasicProvider ldap
@@ -249,7 +226,7 @@ AuthType Basic
   Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/treasurer>
+<Directory /srv/whimsy/www/treasurer>
 AuthType Basic
   AuthName "ASF Members and Officers"
   AuthBasicProvider ldap
@@ -259,7 +236,7 @@ AuthType Basic
   Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/apmail>
+<Directory /srv/whimsy/www/apmail>
 AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
@@ -269,7 +246,7 @@ AuthType Basic
   Require ldap-group cn=member,ou=groups,dc=apache,dc=org
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/members>
+<Directory /srv/whimsy/www/members>
 AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
@@ -279,7 +256,7 @@ AuthType Basic
   Require ldap-group cn=member,ou=groups,dc=apache,dc=org
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/voter>
+<Directory /srv/whimsy/www/voter>
 AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
@@ -289,7 +266,7 @@ AuthType Basic
   Require ldap-group cn=member,ou=groups,dc=apache,dc=org
 </Directory>
 
-<Directory /Users/rubys/git/whimsy/www/secretary>
+<Directory /srv/whimsy/www/secretary>
 AuthType Basic
   AuthName "ASF Secretarial Team"
   AuthBasicProvider ldap
diff --git a/tools/mkconf.rb b/tools/mkconf.rb
index bf18432..52784a1 100644
--- a/tools/mkconf.rb
+++ b/tools/mkconf.rb
@@ -18,7 +18,7 @@ conf.gsub! /\n\s*SSL.*/, ''
 conf.gsub! /\n\s*## SSL.*/, ''
 conf.gsub! "SetEnv HTTPS", "# SetEnv HTTPS"
 
-conf.gsub! '/x1/srv/whimsy', File.expand_path('../..', __FILE__)
+conf.gsub! '/x1/srv/whimsy', '/srv/whimsy'
 
 conf.sub! /^SetEnv PATH .*/ do |line|
   line[/PATH\s+(\/.*?):/, 1] = '/usr/local/bin'

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message