Merge branch 'master' of github.com:Gluejar/regluit

pull/1/head
Andromeda Yelton 2012-11-06 09:29:34 -05:00
commit 4683f5cc0e
2 changed files with 4 additions and 0 deletions

View File

@ -10,6 +10,8 @@ RewriteEngine On
RewriteRule ^/$ https://just.unglueit.com/ [R=301] RewriteRule ^/$ https://just.unglueit.com/ [R=301]
RewriteRule /admin(.*) https://just.unglueit.com/admin$1 [R=301] RewriteRule /admin(.*) https://just.unglueit.com/admin$1 [R=301]
RewriteRule /accounts(.*) https://just.unglueit.com/accounts$1 [R=301] RewriteRule /accounts(.*) https://just.unglueit.com/accounts$1 [R=301]
RewriteRule /pledge(.*) https://just.unglueit.com/pledge$1 [R=301]
RewriteRule /donation(.*) https://just.unglueit.com/donation$1 [R=301]
WSGIDaemonProcess regluit processes=4 threads=4 python-eggs=/tmp/regluit-python-eggs WSGIDaemonProcess regluit processes=4 threads=4 python-eggs=/tmp/regluit-python-eggs
WSGIScriptAlias / /opt/regluit/deploy/just.wsgi WSGIScriptAlias / /opt/regluit/deploy/just.wsgi

View File

@ -13,6 +13,8 @@ RewriteRule (.*) http://unglue.it$1 [R=301,L]
RewriteRule ^/$ https://unglue.it/ [R=301] RewriteRule ^/$ https://unglue.it/ [R=301]
RewriteRule /admin(.*) https://unglue.it/admin$1 [R=301] RewriteRule /admin(.*) https://unglue.it/admin$1 [R=301]
RewriteRule /accounts(.*) https://unglue.it/accounts$1 [R=301] RewriteRule /accounts(.*) https://unglue.it/accounts$1 [R=301]
RewriteRule /pledge(.*) https://unglue.it/pledge$1 [R=301]
RewriteRule /donation(.*) https://unglue.it/donation$1 [R=301]
WSGIDaemonProcess regluit processes=4 threads=4 python-eggs=/tmp/regluit-python-eggs WSGIDaemonProcess regluit processes=4 threads=4 python-eggs=/tmp/regluit-python-eggs
WSGIScriptAlias / /opt/regluit/deploy/regluit.wsgi WSGIScriptAlias / /opt/regluit/deploy/regluit.wsgi