Commit 732bba9a authored by Antony Chazapis's avatar Antony Chazapis

Merge branch 'master' of https://code.grnet.gr/git/pithos

parents 62267a6b fda8660e
......@@ -64,6 +64,16 @@ Edit ``/etc/apache2/sites-available/pithos`` (change the ``ServerName`` directiv
CustomLog ${APACHE_LOG_DIR}/pithos.access.log combined
</VirtualHost>
To disable non-SSL connections, ``/etc/apache2/sites-available/pithos`` should be::
<VirtualHost *:80>
ServerAdmin webmaster@pithos.dev.grnet.gr
ServerName pithos.dev.grnet.gr
RewriteEngine On
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
</VirtualHost>
Edit ``/etc/apache2/sites-available/pithos-ssl`` (assuming files in ``/etc/ssl/private/pithos.dev.grnet.gr.key`` and ``/etc/ssl/certs/pithos.dev.grnet.gr.crt`` - change the ``ServerName`` directive)::
<IfModule mod_ssl.c>
......
......@@ -27,7 +27,7 @@
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script>
var CLOUDBAR_ACTIVE_SERVICE = 'cloud';
var CLOUDBAR_LOCATION = "https://pithos.dev.grnet.gr/im/static/im/cloudbar/";
var CLOUDBAR_LOCATION = "/im/static/im/cloudbar/";
$(document).ready(function(){
$.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
......
......@@ -27,7 +27,7 @@
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
<script>
var CLOUDBAR_ACTIVE_SERVICE = 'okeanos';
var CLOUDBAR_LOCATION = "https://pithos.dev.grnet.gr/im/static/im/cloudbar/";
var CLOUDBAR_LOCATION = "/im/static/im/cloudbar/";
$(document).ready(function(){
$.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment