Commit 50ddae69 authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

astakos: Update references to astakos urls

/im/ renamed to /ui/.
Updated all references in default settings, documentation and constants.
parent 46342299
......@@ -56,7 +56,7 @@ Add in ``/etc/apache2/sites-available/synnefo-ssl``::
ShibConfig /etc/shibboleth/shibboleth2.xml
Alias /shibboleth-sp /usr/share/shibboleth
<Location /im/login/shibboleth>
<Location /ui/login/shibboleth>
AuthType shibboleth
ShibRequireSession On
ShibUseHeaders On
......
......@@ -611,9 +611,9 @@ Then edit ``/etc/synnefo/20-snf-astakos-app-cloudbar.conf`` :
CLOUDBAR_LOCATION = 'https://node1.example.com/static/im/cloudbar/'
CLOUDBAR_SERVICES_URL = 'https://node1.example.com/im/get_services'
CLOUDBAR_SERVICES_URL = 'https://node1.example.com/ui/get_services'
CLOUDBAR_MENU_URL = 'https://node1.example.com/im/get_menu'
CLOUDBAR_MENU_URL = 'https://node1.example.com/ui/get_menu'
Those settings have to do with the black cloudbar endpoints and will be
described in more detail later on in this guide. For now, just edit the domain
......@@ -766,7 +766,7 @@ Open your favorite browser and go to:
``http://node1.example.com/im``
If this redirects you to ``https://node1.example.com/im/`` and you can see
If this redirects you to ``https://node1.example.com/ui/`` and you can see
the "welcome" door of Astakos, then you have successfully setup Astakos.
Let's create our first user. At the homepage click the "CREATE ACCOUNT" button
......@@ -797,7 +797,7 @@ documentation. In production, you can also manually activate a user, by sending
him/her an activation email. See how to do this at the :ref:`User
activation <user_activation>` section.
Now let's go back to the homepage. Open ``http://node1.example.com/im/`` with
Now let's go back to the homepage. Open ``http://node1.example.com/ui/`` with
your browser again. Try to sign in using your new credentials. If the astakos
menu appears and you can see your profile, then you have successfully setup
Astakos.
......@@ -890,7 +890,7 @@ Then we need to setup the web UI and connect it to astakos. To do so, edit
.. code-block:: console
PITHOS_UI_LOGIN_URL = "https://node1.example.com/im/login?next="
PITHOS_UI_LOGIN_URL = "https://node1.example.com/ui/login?next="
PITHOS_UI_FEEDBACK_URL = "https://node2.example.com/feedback"
The ``PITHOS_UI_LOGIN_URL`` option tells the client where to redirect you, if
......@@ -910,8 +910,8 @@ Pithos web UI with the astakos web UI (through the top cloudbar):
CLOUDBAR_LOCATION = 'https://node1.example.com/static/im/cloudbar/'
PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE = '3'
CLOUDBAR_SERVICES_URL = 'https://node1.example.com/im/get_services'
CLOUDBAR_MENU_URL = 'https://node1.example.com/im/get_menu'
CLOUDBAR_SERVICES_URL = 'https://node1.example.com/ui/get_services'
CLOUDBAR_MENU_URL = 'https://node1.example.com/ui/get_menu'
The ``CLOUDBAR_LOCATION`` tells the client where to find the astakos common
cloudbar.
......@@ -1717,8 +1717,8 @@ Edit ``/etc/synnefo/20-snf-cyclades-app-cloudbar.conf``:
CLOUDBAR_LOCATION = 'https://node1.example.com/static/im/cloudbar/'
CLOUDBAR_ACTIVE_SERVICE = '2'
CLOUDBAR_SERVICES_URL = 'https://node1.example.com/im/get_services'
CLOUDBAR_MENU_URL = 'https://account.node1.example.com/im/get_menu'
CLOUDBAR_SERVICES_URL = 'https://node1.example.com/ui/get_services'
CLOUDBAR_MENU_URL = 'https://account.node1.example.com/ui/get_menu'
``CLOUDBAR_LOCATION`` tells the client where to find the Astakos common
cloudbar. The ``CLOUDBAR_SERVICES_URL`` and ``CLOUDBAR_MENU_URL`` options are
......@@ -1765,8 +1765,8 @@ Edit ``/etc/synnefo/20-snf-cyclades-app-ui.conf``:
.. code-block:: console
UI_LOGIN_URL = "https://node1.example.com/im/login"
UI_LOGOUT_URL = "https://node1.example.com/im/logout"
UI_LOGIN_URL = "https://node1.example.com/ui/login"
UI_LOGOUT_URL = "https://node1.example.com/ui/logout"
The ``UI_LOGIN_URL`` option tells the Cyclades Web UI where to redirect users,
if they are not logged in. We point that to Astakos.
......
......@@ -39,8 +39,8 @@ In `/etc/synnefo/astakos.conf` add:
.. code-block:: console
CLOUDBAR_LOCATION = 'https://accounts.example.com/static/im/cloudbar/'
CLOUDBAR_SERVICES_URL = 'https://accounts.example.com/im/get_services'
CLOUDBAR_MENU_URL = 'https://accounts.example.com/im/get_menu'
CLOUDBAR_SERVICES_URL = 'https://accounts.example.com/ui/get_services'
CLOUDBAR_MENU_URL = 'https://accounts.example.com/ui/get_menu'
ASTAKOS_IM_MODULES = ['local']
......
......@@ -41,8 +41,8 @@ In `/etc/synnefo/cloudcms.conf` add:
CLOUDBAR_ACTIVE = True
CLOUDBAR_LOCATION = 'https://accounts.example.com/static/im/cloudbar/'
CLOUDBAR_SERVICES_URL = 'https://accounts.example.com/im/get_services'
CLOUDBAR_MENU_URL = 'https://accounts.example.com/im/get_menu'
CLOUDBAR_SERVICES_URL = 'https://accounts.example.com/ui/get_services'
CLOUDBAR_MENU_URL = 'https://accounts.example.com/ui/get_menu'
WEBPROJECT_SERVE_STATIC = True
......
......@@ -63,8 +63,8 @@ In `/etc/synnefo/cyclades.conf` add:
GANETI_USE_HOTPLUG = True
CLOUDBAR_LOCATION = 'https://accounts.example.com/static/im/cloudbar/'
CLOUDBAR_ACTIVE_SERVICE = '2'
CLOUDBAR_SERVICES_URL = 'https://accounts.example.com/im/get_services'
CLOUDBAR_MENU_URL = 'https://accounts.example.com/im/get_menu'
CLOUDBAR_SERVICES_URL = 'https://accounts.example.com/ui/get_services'
CLOUDBAR_MENU_URL = 'https://accounts.example.com/ui/get_menu'
BACKEND_DB_CONNECTION = 'postgresql://synnefo:example_passw0rd@db.example.com:5432/snf_pithos'
BACKEND_BLOCK_PATH = '/srv/pithos/data/'
......
......@@ -80,12 +80,12 @@ In `/etc/synnefo/webclient.conf` add:
.. code-block:: console
CLOUDBAR_LOCATION = 'https://accounts.example.com/static/im/cloudbar/'
CLOUDBAR_SERVICES_URL = 'https://accounts.example.com/im/get_services'
CLOUDBAR_MENU_URL = 'https://accounts.example.com/im/get_menu'
CLOUDBAR_SERVICES_URL = 'https://accounts.example.com/ui/get_services'
CLOUDBAR_MENU_URL = 'https://accounts.example.com/ui/get_menu'
PITHOS_UI_CLOUDBAR_ACTIVE_SERVICE = 'XXXXXXXX'
PITHOS_UI_LOGIN_URL = "https://accounts.example.com/im/login?next="
PITHOS_UI_LOGIN_URL = "https://accounts.example.com/ui/login?next="
PITHOS_UI_FEEDBACK_URL = "/feedback"
......
......@@ -84,7 +84,7 @@ AUTHENTICATION_BACKENDS = (
'astakos.im.auth_backends.EmailBackend',
'astakos.im.auth_backends.TokenBackend')
LOGIN_URL = '/im/'
LOGIN_URL = '/ui/'
CUSTOM_USER_MODEL = 'astakos.im.AstakosUser'
......
#CLOUDBAR_ACTIVE = True
#CLOUDBAR_LOCATION = 'https://accounts.example.synnefo.org/static/im/cloudbar/'
#CLOUDBAR_COOKIE_NAME = '_pithos2_a'
#CLOUDBAR_SERVICES_URL = 'https://accounts.example.synnefo.org/im/get_services'
#CLOUDBAR_MENU_URL = 'https://accounts.example.synnefo.org/im/get_menu'
#CLOUDBAR_SERVICES_URL = 'https://accounts.example.synnefo.org/ui/get_services'
#CLOUDBAR_MENU_URL = 'https://accounts.example.synnefo.org/ui/get_menu'
......@@ -30,16 +30,13 @@ def cloudbar(request):
"""
CB_ACTIVE = getattr(settings, 'CLOUDBAR_ACTIVE', True)
CB_LOCATION = getattr(settings, 'CLOUDBAR_LOCATION',
'https://accounts.okeanos.grnet.gr/static/im/cloudbar/')
CB_LOCATION = getattr(settings, 'CLOUDBAR_LOCATION')
CB_COOKIE_NAME = getattr(settings, 'CLOUDBAR_COOKIE_NAME',
'okeanos_account')
CB_ACTIVE_SERVICE = getattr(settings, 'CLOUDBAR_ACTIVE_SERVICE',
'cloud')
CB_SERVICES_URL = getattr(settings, 'CLOUDBAR_SERVICES_URL',
'https://accounts.okeanos.grnet.gr/im/get_services')
CB_MENU_URL = getattr(settings, 'CLOUDBAR_MENU_URL',
'https://accounts.okeanos.grnet.gr/im/get_menu')
CB_SERVICES_URL = getattr(settings, 'CLOUDBAR_SERVICES_URL')
CB_MENU_URL = getattr(settings, 'CLOUDBAR_MENU_URL')
CB_HEIGHT = getattr(settings, 'CLOUDBAR_HEIGHT',
'35')
CB_BGCOLOR = getattr(settings, 'CLOUDBAR_BACKGROUND_COLOR',
......
......@@ -2,6 +2,6 @@
#CLOUDBAR_LOCATION = 'https://accounts.synnefo.org/static/im/cloudbar/'
#CLOUDBAR_COOKIE_NAME = '_pithos2_a'
#CLOUDBAR_ACTIVE_SERVICE = 'cloud'
#CLOUDBAR_SERVICES_URL = 'https://accounts.okeanos.grnet.gr/im/get_services'
#CLOUDBAR_MENU_URL = 'https://accounts.okeanos.grnet.gr/im/get_menu'
#CLOUDBAR_SERVICES_URL = 'https://accounts.okeanos.grnet.gr/ui/get_services'
#CLOUDBAR_MENU_URL = 'https://accounts.okeanos.grnet.gr/ui/get_menu'
#
......@@ -2,6 +2,5 @@ CLOUDBAR_ACTIVE = True
CLOUDBAR_LOCATION = 'https://accounts.synnefo.org/static/im/cloudbar/'
CLOUDBAR_COOKIE_NAME = '_pithos2_a'
CLOUDBAR_ACTIVE_SERVICE = 'cloud'
CLOUDBAR_SERVICES_URL = 'https://accounts.synnefo.org/im/get_services'
CLOUDBAR_MENU_URL = 'https://accounts.synnefo.org/im/get_menu'
CLOUDBAR_SERVICES_URL = 'https://accounts.synnefo.org/ui/get_services'
CLOUDBAR_MENU_URL = 'https://accounts.synnefo.org/ui/get_menu'
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