whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] 01/02: Remove PassengerUser and PassengerGroup as these are OS specific
Date Mon, 22 Jan 2018 20:47:55 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

commit 97895ac27bfcfe3a131504b1b9f85d15612fc405
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Mon Jan 22 15:46:56 2018 -0500

    Remove PassengerUser and PassengerGroup as these are OS specific
    
    I plan to update MACOSX.md to suggest adding these values to passenger.conf
---
 config/whimsy.conf | 52 ++++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/config/whimsy.conf b/config/whimsy.conf
index 4cc486a..a260591 100644
--- a/config/whimsy.conf
+++ b/config/whimsy.conf
@@ -36,15 +36,17 @@ PassengerFriendlyErrorPages on
 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 /srv/whimsy/www/>
   AddHandler cgi-script .cgi
   MultiViewsMatch Any
   CheckSpelling On
+
+  <FilesMatch ".(js|css)$">
+    <If "%{QUERY_STRING} =~ /^\d+$/">
+      Header set Cache-Control "public, max-age=31536000, immutable"
+      ExpiresDefault "access plus 1 year"
+    </If>
+  </FilesMatch>
 </Directory>
 
 <Directory /srv/whimsy/www/public/>
@@ -131,7 +133,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   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"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -141,7 +143,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   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"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -151,7 +153,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   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"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -161,7 +163,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   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"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -171,7 +173,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   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"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -181,7 +183,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   AuthType Basic
   AuthName "ASF Members and Incubator PMC"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -191,7 +193,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   AuthType Basic
   AuthName "ASF Members and Incubator PMC"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -201,7 +203,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   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"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -211,7 +213,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   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"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -221,7 +223,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   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"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -231,12 +233,14 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   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"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.apache.org:636/ou=people,dc=apache,dc=org?uid"
   AuthLDAPGroupAttribute memberUid
   AuthLDAPGroupAttributeIsDN off
-  require expr %{REQUEST_URI} == '/board/agenda/app.js'
-  require expr %{REQUEST_URI} =~ m#^/board/agenda/[-\d]+/bootstrap.html$#
-  require expr %{REQUEST_URI} == '/board/agenda/stylesheets/app.css'
+  Require expr %{REQUEST_URI} == '/board/agenda/app.js'
+  Require expr %{REQUEST_URI} == '/board/agenda/app.js.map'
+  Require expr %{REQUEST_URI} =~ m#^/board/agenda/[-\d]+/bootstrap.html$#
+  Require expr %{REQUEST_URI} == '/board/agenda/stylesheets/app.css'
+  Require expr %{REQUEST_URI} == '/board/agenda/sw.js'
   Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
 </Directory>
 
@@ -244,7 +248,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -254,7 +258,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -264,7 +268,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.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
@@ -274,7 +278,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   AuthType Basic
   AuthName "ASF Secretarial Team"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.apache.org:636/ou=people,dc=apache,dc=org?uid"
   AuthLDAPGroupAttribute member
   AuthLDAPGroupAttributeIsDN on
   <RequireAny>
@@ -287,7 +291,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
   AuthType Basic
   AuthName "ASF Secretarial Team"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPUrl "ldaps://ldap-us-ro.apache.org:636 ldap-eu-ro.apache.org:636/ou=people,dc=apache,dc=org?uid"
   AuthLDAPGroupAttribute member
   AuthLDAPGroupAttributeIsDN on
   <RequireAny>

-- 
To stop receiving notification emails like this one, please contact
rubys@apache.org.

Mime
View raw message