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: update Mac OS/X passenger and whimsy config
Date Fri, 28 Apr 2017 01:41:26 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  8a08ea4   update Mac OS/X passenger and whimsy config
8a08ea4 is described below

commit 8a08ea462c8b380cc7bcbb48128b5965dad4f01f
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Thu Apr 27 21:41:11 2017 -0400

    update Mac OS/X passenger and whimsy config
---
 MACOSX.md          |  24 ++-
 config/whimsy.conf | 421 ++++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 317 insertions(+), 128 deletions(-)

diff --git a/MACOSX.md b/MACOSX.md
index c7ae816..60a405a 100644
--- a/MACOSX.md
+++ b/MACOSX.md
@@ -238,21 +238,27 @@ $ curl whimsy.local
 Install passenger
 ------------------------------------------------
 
+Follow the [Installing Passenger + Apache on Mac OS X](https://www.phusionpassenger.com/library/install/apache/install/oss/osx/)
instructions, which are summaried below:.
+
 Install:
 
 ```
-$ gem install passenger
-$ passenger-install-apache2-module
-$ sudo apachectl restart
+$ brew install passenger
+$ brew info passenger
+```
+
+For the second step (1brew info passenger`), you will need to
+follow the instructions -- which essentially is to copy a few lines to
+to a specified location.  Despite what it says, change the last line to
+
+```
+PassengerDefaultRuby /usr/local/bin/ruby
 ```
 
-For the second step ('passenger-install-apache2-module`), you will need to
-follow the instructions -- which essentially are to press enter twice and then
-copy a file to specified location.  If for any reason you skip that last step,
-you can redo it with the following command:
+Restart the server:
 
 ```
-$ sudo bash -c 'passenger-install-apache2-module --snippet > /etc/apache2/other/passenger.conf'
+sudo apachectl restart
 ```
 
 Verify:
@@ -282,6 +288,8 @@ Once again, Edit `/etc/apache2/httpd.conf` using sudo and your favorite
text edi
 Uncomment out the following lines:
 
 ```
+LoadModule speling_module libexec/apache2/mod_speling.so
+
 LoadModule rewrite_module libexec/apache2/mod_rewrite.so
 
 LoadModule authnz_ldap_module libexec/apache2/mod_authnz_ldap.so
diff --git a/config/whimsy.conf b/config/whimsy.conf
index abd884e..84d70bf 100644
--- a/config/whimsy.conf
+++ b/config/whimsy.conf
@@ -1,135 +1,316 @@
-# whimsy.local Virtual Host
-#
-# Required modules: mod_cgi
-# Required modules: mod_expires
-# Required modules: mod_rewrite
-# Required modules: mod_ldap
-# Required modules: mod_authnz_ldap
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
 
 <VirtualHost *:80>
-  SetEnv PATH /usr/local/bin:${PATH}
-  PassengerFriendlyErrorPages on
+  ServerName whimsy.local
 
-  Servername whimsy.local
-  DocumentRoot /Users/rubys/git/whimsy/www
-  DirectoryIndex index.html index.cgi
+  ## Vhost docroot
+  DocumentRoot "/Users/rubys/git/whimsy/www"
+
+  ## Directories, there should at least be a declaration for /Users/rubys/git/whimsy/www
+
+  <Directory "/Users/rubys/git/whimsy/www">
+    Options +FollowSymLinks +MultiViews +ExecCGI
+    AllowOverride None
+    Require all granted
+  </Directory>
 
   ## Logging
   ErrorLog "/var/log/apache2/whimsy_error.log"
   ServerSignature Off
-  CustomLog "/var/log/apache2/whimsy_access.log" combined
-
-  ExpiresActive On
-  <If "%{QUERY_STRING} =~ /^\d+$/">
-    ExpiresByType text/css "access plus 1 month"
-    ExpiresByType application/javascript "access plus 1 month"
-  </If>
-
-  RewriteEngine on
-  RewriteRule ^.*$ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-
-  <Directory /Users/rubys/git/whimsy/www>
-    Require ip 127.0.0.1
-    Require ip ::1
-    Options +ExecCGI +Indexes +FollowSymLinks +MultiViews
-    AddHandler cgi-script .cgi
-    MultiViewsMatch Any
-  </Directory>
+  CustomLog "/var/log/apache2/whimsy_access.log" combined 
 
-  Alias /racktest/ /Users/rubys/git/whimsy/www/racktest/public
-
-  <Location /racktest>
-    PassengerBaseURI /racktest
-    PassengerAppRoot /Users/rubys/git/whimsy/www/racktest
-    Options -MultiViews
-    # CheckSpelling Off
-    # SetEnv HTTPS on
-  </Location>
-
-  Alias /board/agenda/ /Users/rubys/git/whimsy/www/board/agenda/public
-
-  <Location /board/agenda>
-    PassengerBaseURI /board/agenda
-    PassengerAppRoot /Users/rubys/git/whimsy/www/board/agenda
-    Options -MultiViews
-    # CheckSpelling Off
-    # SetEnv HTTPS on
-  </Location>
-
-  <Directory /Users/rubys/git/whimsy/www/board/agenda>
-    AuthType Basic
-    AuthName "ASF Members and Officers"
-    AuthBasicProvider ldap
-    AuthLDAPUrl "ldaps://ldap-lb-us.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>
+  ## Server aliases
+  ServerAlias whimsy3.apache.org
+  ServerAlias whimsy-vm3.apache.org
 
-  Alias /roster/ /Users/rubys/git/whimsy/www/roster/public
-
-  <Location /roster>
-    PassengerBaseURI /roster
-    PassengerAppRoot /Users/rubys/git/whimsy/www/roster
-    Options -MultiViews
-    # CheckSpelling Off
-    # SetEnv HTTPS on
-  </Location>
-
-  <Directory /Users/rubys/git/whimsy/www/roster>
-    AuthType Basic
-    AuthName "ASF Committers"
-    AuthBasicProvider ldap
-    AuthLDAPUrl "ldaps://ldap-lb-us.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>
+  ## Custom fragment
 
-  <Directory /Users/rubys/git/whimsy/www/officers>
-    AuthType Basic
-    AuthName "ASF Members and Officers"
-    AuthBasicProvider ldap
-    AuthLDAPUrl "ldaps://ldap-lb-us.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>
+SetEnv PATH /usr/local/rvm/wrappers/ruby-2.3.1:${PATH}
 
-  Alias /secmail/ /Users/rubys/git/whimsy/www/secmail/public
-
-  <Location /secmail>
-    PassengerBaseURI /secmail
-    PassengerAppRoot /Users/rubys/git/whimsy/www/secmail
-    Options -MultiViews
-    # CheckSpelling Off
-    # SetEnv HTTPS on
-  </Location>
-
-  <Directory /Users/rubys/git/whimsy/www/secmail>
-    AuthType Basic
-    AuthName "ASF Committers"
-    AuthBasicProvider ldap
-    AuthLDAPUrl "ldaps://ldap-lb-us.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>
+PassengerFriendlyErrorPages on
 
-  # for secretary workbench
-  Alias /members/received /srv/secretary/workbench/documents/received
-  <Directory /srv/secretary/workbench/documents/received>
-    Require ip 127.0.0.1
-    Require ip ::1
-  </Directory>
+AddCharset UTF-8 .json
+
+ExpiresActive On
+<If "%{QUERY_STRING} =~ /^\d+$/">
+  ExpiresByType text/css "access plus 1 month"
+  ExpiresByType application/javascript "access plus 1 month"
+</If>
+
+<Directory /Users/rubys/git/whimsy/www/>
+  AddHandler cgi-script .cgi
+  MultiViewsMatch Any
+  CheckSpelling On
+</Directory>
+
+<Directory /Users/rubys/git/whimsy/www/public/>
+  Header add Access-Control-Allow-Origin "*"
+  Options +Indexes
+</Directory>
+
+<Directory /Users/rubys/git/whimsy/www/logs>
+  Options +Indexes
+</Directory>
+
+<Directory /Users/rubys/git/whimsy/www/members/log>
+  Options +Indexes
+</Directory>
+
+RewriteEngine on
+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
+
+# We now have local custom error pages
+ErrorDocument 401 /401.html
+ErrorDocument 404 /404.html
+ErrorDocument 500 /500.html
+
+Alias /board/agenda/ /Users/rubys/git/whimsy/www/board/agenda/public
+
+<Location /board/agenda>
+PassengerBaseURI /board/agenda
+  PassengerAppRoot /Users/rubys/git/whimsy/www/board/agenda
+  Options -MultiViews
+  CheckSpelling Off
+  SetEnv HTTPS on
+</Location>
+
+Alias /racktest/ /Users/rubys/git/whimsy/www/racktest/public
+
+<Location /racktest>
+PassengerBaseURI /racktest
+  PassengerAppRoot /Users/rubys/git/whimsy/www/racktest
+  Options -MultiViews
+  CheckSpelling Off
+  SetEnv HTTPS on
+</Location>
+
+Alias /roster/ /Users/rubys/git/whimsy/www/roster/public
 
-  <Directory /Users/rubys/git/whimsy/www/secretary>
-    AuthType Basic
-    AuthName "ASF Secretarial Team"
-    AuthBasicProvider ldap
-    AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
-    AuthLDAPGroupAttribute member
-    AuthLDAPGroupAttributeIsDN on
+<Location /roster>
+PassengerBaseURI /roster
+  PassengerAppRoot /Users/rubys/git/whimsy/www/roster
+  Options -MultiViews
+  CheckSpelling Off
+  SetEnv HTTPS on
+</Location>
+
+Alias /secretary/workbench/ /Users/rubys/git/whimsy/www/secretary/workbench/public
+
+<Location /secretary/workbench>
+PassengerBaseURI /secretary/workbench
+  PassengerAppRoot /Users/rubys/git/whimsy/www/secretary/workbench
+  Options -MultiViews
+  CheckSpelling Off
+  SetEnv HTTPS on
+</Location>
+
+Alias /test/icla/ /Users/rubys/git/whimsy/www/test/icla/public
+
+<Location /test/icla>
+PassengerBaseURI /test/icla
+  PassengerAppRoot /Users/rubys/git/whimsy/www/test/icla
+  Options -MultiViews
+  CheckSpelling Off
+  SetEnv HTTPS on
+</Location>
+
+<LocationMatch ^/board/subscriptions>
+AuthType Basic
+  AuthName "ASF Committers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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
+</LocationMatch>
+
+<Directory /Users/rubys/git/whimsy/www/classic/roster>
+AuthType Basic
+  AuthName "ASF Committers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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>
+AuthType Basic
+  AuthName "ASF Committers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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/test/icla>
+AuthType Basic
+  AuthName "ASF Committers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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/roster>
+AuthType Basic
+  AuthName "ASF Committers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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/test/roster>
+AuthType Basic
+  AuthName "ASF Committers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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>
+
+<LocationMatch ^/incubator/moderators>
+AuthType Basic
+  AuthName "ASF Members and Incubator PMC"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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
+</LocationMatch>
+
+<LocationMatch ^/incubator/signoff>
+AuthType Basic
+  AuthName "ASF Members and Incubator PMC"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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
+</LocationMatch>
+
+<Directory /Users/rubys/git/whimsy/www/board/agenda>
+AuthType Basic
+  AuthName "ASF Members and Officers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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>
+AuthType Basic
+  AuthName "ASF Members and Officers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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/fundraising>
+AuthType Basic
+  AuthName "ASF Members and Officers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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/officers>
+AuthType Basic
+  AuthName "ASF Members and Officers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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/treasurer>
+AuthType Basic
+  AuthName "ASF Members and Officers"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.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/apmail>
+AuthType Basic
+  AuthName "ASF Members"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPGroupAttribute memberUid
+  AuthLDAPGroupAttributeIsDN off
+  Require ldap-group cn=member,ou=groups,dc=apache,dc=org
+</Directory>
+
+<Directory /Users/rubys/git/whimsy/www/members>
+AuthType Basic
+  AuthName "ASF Members"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPGroupAttribute memberUid
+  AuthLDAPGroupAttributeIsDN off
+  Require ldap-group cn=member,ou=groups,dc=apache,dc=org
+</Directory>
+
+<Directory /Users/rubys/git/whimsy/www/voter>
+AuthType Basic
+  AuthName "ASF Members"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPGroupAttribute memberUid
+  AuthLDAPGroupAttributeIsDN off
+  Require ldap-group cn=member,ou=groups,dc=apache,dc=org
+</Directory>
+
+<Directory /Users/rubys/git/whimsy/www/secretary>
+AuthType Basic
+  AuthName "ASF Secretarial Team"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPGroupAttribute member
+  AuthLDAPGroupAttributeIsDN on
+  <RequireAny>
     Require ldap-group cn=asf-secretary,ou=groups,ou=services,dc=apache,dc=org
-  </Directory>
+    Require ldap-group cn=apldap,ou=groups,ou=services,dc=apache,dc=org
+  </RequireAny>
+</Directory>
+
+<LocationMatch ^/board/publish_minutes>
+AuthType Basic
+  AuthName "ASF Secretarial Team"
+  AuthBasicProvider ldap
+  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPGroupAttribute member
+  AuthLDAPGroupAttributeIsDN on
+  <RequireAny>
+    Require ldap-group cn=asf-secretary,ou=groups,ou=services,dc=apache,dc=org
+    Require ldap-group cn=apldap,ou=groups,ou=services,dc=apache,dc=org
+  </RequireAny>
+</LocationMatch>
+
 </VirtualHost>

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

Mime
View raw message