diff options
| -rw-r--r-- | server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf | 10 | ||||
| -rw-r--r-- | server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf | 45 |
2 files changed, 38 insertions, 17 deletions
diff --git a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf index 58656b2..469f610 100644 --- a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf +++ b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf @@ -332,6 +332,16 @@ SSLStaplingCache shmcb:/var/run/apache2/stapling_cache(128000) RewriteCond %{HTTP_HOST} ^(.*)\.jogamp\.org$ [NC] RewriteRule ^/(.*)$ https://jogamp.org/%1/$1 [R=301,L,NE] + + RewriteCond %{HTTP_HOST} ^www\.jogamp\.com$ [NC] + RewriteRule ^/(.*)$ https://jogamp.org/$1 [R=301,L,NE] + + RewriteCond %{HTTP_HOST} ^(.*)\.jogamp\.com$ [NC] + RewriteRule ^/(.*)$ https://jogamp.org/%1/$1 [R=301,L,NE] + + RewriteCond %{HTTP_HOST} ^jogamp\.com$ [NC] + RewriteRule ^/(.*)$ https://jogamp.org/$1 [R=301,L,NE] + </VirtualHost> </IfModule> diff --git a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf index d08099e..437016e 100644 --- a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf +++ b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf @@ -58,7 +58,6 @@ #</Directory> ScriptAlias /cgit/ "/srv/www/cgit/cgit.cgi/" - #RedirectMatch ^/cgit$ /cgit/ Alias /cgit-css "/usr/share/cgit/" <Directory "/srv/www/cgit/"> AllowOverride None @@ -87,7 +86,7 @@ RewriteRule . - [F,L] </Directory> <Directory "/srv/www/jogamp.org/git"> - Include sites-available/gitweb-to-cgit-rel.conf + Include sites-available/gitweb-to-cgit-rel_ssl.conf </Directory> Alias /icons/ "/srv/www/jogamp.org/icons/" @@ -107,20 +106,20 @@ # Due to security concerns, session hijacking .. etc .. the whole # bugzilla stream will go over https # - RewriteCond %{REQUEST_URI} ^/wiki/index.php$ - RewriteCond %{QUERY_STRING} ^title=Special:UserLogin - RewriteCond %{REQUEST_METHOD} ^GET$ - RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R=301,L,NE] + #RewriteCond %{REQUEST_URI} ^/wiki/index.php$ + #RewriteCond %{QUERY_STRING} ^title=Special:UserLogin + #RewriteCond %{REQUEST_METHOD} ^GET$ + #RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R=301,L,NE] - RewriteCond %{REQUEST_URI} ^/bugzilla - RewriteRule ^/bugzilla/(.*)$ https://%{SERVER_NAME}/bugzilla/$1 [R=301,L,NE] + #RewriteCond %{REQUEST_URI} ^/bugzilla + #RewriteRule ^/bugzilla/(.*)$ https://%{SERVER_NAME}/bugzilla/$1 [R=301,L,NE] # # Due to security concerns, session hijacking .. etc .. the whole # hudson and bugzilla stream will go over https # - RewriteCond %{REQUEST_URI} ^/chuck - RewriteRule ^/chuck/(.*)$ https://%{SERVER_NAME}/chuck/$1 [R=301,L,NE] + #RewriteCond %{REQUEST_URI} ^/chuck + #RewriteRule ^/chuck/(.*)$ https://%{SERVER_NAME}/chuck/$1 [R=301,L,NE] #RewriteCond %{REQUEST_URI} ^/chuck #RewriteRule ^/chuck/login(.*)$ https://%{SERVER_NAME}/chuck/login$1 [R=301,L,NE] @@ -164,22 +163,22 @@ #ProxyPassReverse /chuck http://localhost:8080/chuck RewriteCond %{HTTP_HOST} ^www\.jogamp\.org$ [NC] - RewriteRule ^/(.*)$ http://jogamp.org/$1 [R=301,L,NE] + RewriteRule ^/(.*)$ https://jogamp.org/$1 [R=301,L,NE] RewriteCond %{HTTP_HOST} ^scm\.jogamp\.org$ [NC] - RewriteRule ^/(.*)$ http://jogamp.org/git/$1 [R=301,L,NE] + RewriteRule ^/(.*)$ https://jogamp.org/cgit/$1 [R=301,L,NE] RewriteCond %{HTTP_HOST} ^joal\.jogamp\.org$ [NC] - RewriteRule ^/(.*)$ http://jogamp.org/joal/www/$1 [R=301,L,NE] + RewriteRule ^/(.*)$ https://jogamp.org/joal/www/$1 [R=301,L,NE] RewriteCond %{HTTP_HOST} ^jogl\.jogamp\.org$ [NC] - RewriteRule ^/(.*)$ http://jogamp.org/jogl/www/$1 [R=301,L,NE] + RewriteRule ^/(.*)$ https://jogamp.org/jogl/www/$1 [R=301,L,NE] RewriteCond %{HTTP_HOST} ^jocl\.jogamp\.org$ [NC] - RewriteRule ^/(.*)$ http://jogamp.org/jocl/www/$1 [R=301,L,NE] + RewriteRule ^/(.*)$ https://jogamp.org/jocl/www/$1 [R=301,L,NE] RewriteCond %{HTTP_HOST} ^demos\.jogamp\.org$ [NC] - RewriteRule ^/(.*)$ http://jogamp.org/jogl-demos/www/$1 [R=301,L,NE] + RewriteRule ^/(.*)$ https://jogamp.org/jogl-demos/www/$1 [R=301,L,NE] RewriteCond %{HTTP_HOST} ^bugzilla\.jogamp\.org$ [NC] RewriteRule ^/(.*)$ https://jogamp.org/bugzilla/$1 [R=301,L,NE] @@ -188,7 +187,19 @@ RewriteRule ^/(.*)$ https://jogamp.org/chuck/$1 [R=301,L,NE] RewriteCond %{HTTP_HOST} ^(.*)\.jogamp\.org$ [NC] - RewriteRule ^/(.*)$ http://jogamp.org/%1/$1 [R=301,L,NE] + RewriteRule ^/(.*)$ https://jogamp.org/%1/$1 [R=301,L,NE] + + RewriteCond %{HTTP_HOST} ^jogamp\.org$ [NC] + RewriteRule ^/(.*)$ https://jogamp.org/$1 [R=301,L,NE] + + RewriteCond %{HTTP_HOST} ^www\.jogamp\.com$ [NC] + RewriteRule ^/(.*)$ https://jogamp.org/$1 [R=301,L,NE] + + RewriteCond %{HTTP_HOST} ^(.*)\.jogamp\.com$ [NC] + RewriteRule ^/(.*)$ https://jogamp.org/%1/$1 [R=301,L,NE] + + RewriteCond %{HTTP_HOST} ^jogamp\.com$ [NC] + RewriteRule ^/(.*)$ https://jogamp.org/$1 [R=301,L,NE] </VirtualHost> # |