From 6a0e2f145a1a5c5fdc67fda912be23676e8b5fa4 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 25 May 2021 19:19:12 +0200 Subject: [PATCH] Modified admin path to isard-sso-admin --- admin/src/admin/__init__.py | 8 +-- admin/src/admin/static/js/external.js | 2 +- admin/src/admin/static/js/groups.js | 2 +- admin/src/admin/static/js/roles.js | 2 +- admin/src/admin/static/js/users.js | 2 +- admin/src/admin/static/templates/base.html | 70 +++++++++---------- admin/src/admin/static/templates/header.html | 6 +- admin/src/admin/static/templates/login.html | 22 +++--- .../src/admin/static/templates/page_404.html | 20 +++--- .../src/admin/static/templates/page_500.html | 20 +++--- .../admin/static/templates/pages/about.html | 8 +-- .../static/templates/pages/external.html | 12 ++-- .../admin/static/templates/pages/groups.html | 12 ++-- .../admin/static/templates/pages/roles.html | 12 ++-- .../admin/static/templates/pages/users.html | 12 ++-- admin/src/admin/static/templates/sidebar.html | 14 ++-- admin/src/admin/views/MenuViews.py | 16 ++--- docker-compose-parts/admin.yml | 4 +- docker-compose-parts/backup.yml | 2 +- docker/haproxy/haproxy.conf | 4 +- 20 files changed, 125 insertions(+), 125 deletions(-) diff --git a/admin/src/admin/__init__.py b/admin/src/admin/__init__.py index c284fc8..ba83bdb 100644 --- a/admin/src/admin/__init__.py +++ b/admin/src/admin/__init__.py @@ -43,15 +43,15 @@ else: ''' Serve static files ''' -@app.route('/dd-admin/build/') +@app.route('/isard-sso-admin/build/') def send_build(path): return send_from_directory(os.path.join(app.root_path, 'node_modules/gentelella/build'), path) -@app.route('/dd-admin/vendors/') +@app.route('/isard-sso-admin/vendors/') def send_vendors(path): return send_from_directory(os.path.join(app.root_path, 'node_modules/gentelella/vendors'), path) -@app.route('/dd-admin/templates/') +@app.route('/isard-sso-admin/templates/') def send_templates(path): return send_from_directory(os.path.join(app.root_path, 'templates'), path) @@ -59,7 +59,7 @@ def send_templates(path): # def send_templates(path): # return send_from_directory(os.path.join(app.root_path, 'static/templates'), path) -@app.route('/dd-admin/static/') +@app.route('/isard-sso-admin/static/') def send_static_js(path): return send_from_directory(os.path.join(app.root_path, 'static'), path) diff --git a/admin/src/admin/static/js/external.js b/admin/src/admin/static/js/external.js index 4674ed1..2d3d3d0 100644 --- a/admin/src/admin/static/js/external.js +++ b/admin/src/admin/static/js/external.js @@ -28,7 +28,7 @@ $(document).ready(function() { //DataTable Main renderer var table = $('#users').DataTable({ "ajax": { - "url": "/dd-admin/external_users_list", + "url": "/isard-sso-admin/external_users_list", "dataSrc": "" }, "language": { diff --git a/admin/src/admin/static/js/groups.js b/admin/src/admin/static/js/groups.js index 36dabc9..6a602b4 100644 --- a/admin/src/admin/static/js/groups.js +++ b/admin/src/admin/static/js/groups.js @@ -17,7 +17,7 @@ $(document).ready(function() { //DataTable Main renderer var table = $('#groups').DataTable({ "ajax": { - "url": "/dd-admin/groups_list", + "url": "/isard-sso-admin/groups_list", "dataSrc": "" }, "language": { diff --git a/admin/src/admin/static/js/roles.js b/admin/src/admin/static/js/roles.js index de1938e..83e4b31 100644 --- a/admin/src/admin/static/js/roles.js +++ b/admin/src/admin/static/js/roles.js @@ -17,7 +17,7 @@ $(document).ready(function() { //DataTable Main renderer var table = $('#roles').DataTable({ "ajax": { - "url": "/dd-admin/roles_list", + "url": "/isard-sso-admin/roles_list", "dataSrc": "" }, "language": { diff --git a/admin/src/admin/static/js/users.js b/admin/src/admin/static/js/users.js index 640d35b..e266cae 100644 --- a/admin/src/admin/static/js/users.js +++ b/admin/src/admin/static/js/users.js @@ -17,7 +17,7 @@ $(document).ready(function() { //DataTable Main renderer var table = $('#users').DataTable({ "ajax": { - "url": "/dd-admin/users_list", + "url": "/isard-sso-admin/users_list", "dataSrc": "" }, "language": { diff --git a/admin/src/admin/static/templates/base.html b/admin/src/admin/static/templates/base.html index 348943e..2901cf9 100644 --- a/admin/src/admin/static/templates/base.html +++ b/admin/src/admin/static/templates/base.html @@ -14,29 +14,29 @@ - + - + - + - + - - + + - + - - + + - - + + {% block css %}{% endblock %} - + - + @@ -83,45 +83,45 @@ - + - + - + - - + + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - - - + + + {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} diff --git a/admin/src/admin/static/templates/header.html b/admin/src/admin/static/templates/header.html index c0fd9aa..6e6e6c0 100644 --- a/admin/src/admin/static/templates/header.html +++ b/admin/src/admin/static/templates/header.html @@ -7,12 +7,12 @@
    • diff --git a/admin/src/admin/static/templates/login.html b/admin/src/admin/static/templates/login.html index bf9d6d5..ef1680b 100644 --- a/admin/src/admin/static/templates/login.html +++ b/admin/src/admin/static/templates/login.html @@ -10,16 +10,16 @@ Login | Digital Democratic - + - + - + - - + + - + @@ -58,11 +58,11 @@ - + - - - + + + {% with messages = get_flashed_messages(with_categories=true) %} @@ -83,5 +83,5 @@ {% endif %} {% endwith %} - + diff --git a/admin/src/admin/static/templates/page_404.html b/admin/src/admin/static/templates/page_404.html index 452f855..edda5ef 100755 --- a/admin/src/admin/static/templates/page_404.html +++ b/admin/src/admin/static/templates/page_404.html @@ -10,14 +10,14 @@ Page not found! | Digital Democratic - + - + - + - + @@ -30,7 +30,7 @@

    404

    Sorry but we couldn't find this page

    This page you are looking for does not exist Report this? - Go back to login page + Go back to login page

    - + - + - + - + - + diff --git a/admin/src/admin/static/templates/page_500.html b/admin/src/admin/static/templates/page_500.html index 6aa58aa..4dff9d3 100755 --- a/admin/src/admin/static/templates/page_500.html +++ b/admin/src/admin/static/templates/page_500.html @@ -10,14 +10,14 @@ Page not allowed! | Digital Democratic - + - + - + - + @@ -30,7 +30,7 @@

    500

    Internal Server Error

    We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing. Report this? - Go back to login page + Go back to login page

    - + - + - + - + - + diff --git a/admin/src/admin/static/templates/pages/about.html b/admin/src/admin/static/templates/pages/about.html index 1c49d3b..eeff9b6 100644 --- a/admin/src/admin/static/templates/pages/about.html +++ b/admin/src/admin/static/templates/pages/about.html @@ -6,7 +6,7 @@
    - +

    Digital Democratic

    Schools apps integrations

    @@ -38,7 +38,7 @@
    -

    +

    License

    @@ -51,7 +51,7 @@ {% endblock %} {% block pagescript %} - + - + {% endblock %} diff --git a/admin/src/admin/static/templates/pages/external.html b/admin/src/admin/static/templates/pages/external.html index e86e2d1..c09ddab 100644 --- a/admin/src/admin/static/templates/pages/external.html +++ b/admin/src/admin/static/templates/pages/external.html @@ -2,9 +2,9 @@ {% extends "base.html" %} {% block css %} - + - + {% endblock %} {% block content %} @@ -50,11 +50,11 @@ {% block pagescript %} - + - + - + - + {% endblock %} diff --git a/admin/src/admin/static/templates/pages/groups.html b/admin/src/admin/static/templates/pages/groups.html index 360d606..d8edefb 100644 --- a/admin/src/admin/static/templates/pages/groups.html +++ b/admin/src/admin/static/templates/pages/groups.html @@ -2,9 +2,9 @@ {% extends "base.html" %} {% block css %} - + - + {% endblock %} {% block content %} @@ -46,11 +46,11 @@ {% block pagescript %} - + - + - + - + {% endblock %} diff --git a/admin/src/admin/static/templates/pages/roles.html b/admin/src/admin/static/templates/pages/roles.html index 6b9ebf6..f3a288b 100644 --- a/admin/src/admin/static/templates/pages/roles.html +++ b/admin/src/admin/static/templates/pages/roles.html @@ -2,9 +2,9 @@ {% extends "base.html" %} {% block css %} - + - + {% endblock %} {% block content %} @@ -42,11 +42,11 @@ {% block pagescript %} - + - + - + - + {% endblock %} diff --git a/admin/src/admin/static/templates/pages/users.html b/admin/src/admin/static/templates/pages/users.html index 2c24ac4..974dac6 100644 --- a/admin/src/admin/static/templates/pages/users.html +++ b/admin/src/admin/static/templates/pages/users.html @@ -2,9 +2,9 @@ {% extends "base.html" %} {% block css %} - + - + {% endblock %} {% block content %} @@ -48,11 +48,11 @@ {% block pagescript %} - + - + - + - + {% endblock %} diff --git a/admin/src/admin/static/templates/sidebar.html b/admin/src/admin/static/templates/sidebar.html index 15f0ae2..91e9f9c 100644 --- a/admin/src/admin/static/templates/sidebar.html +++ b/admin/src/admin/static/templates/sidebar.html @@ -1,6 +1,6 @@
    - - + + Digital Democratic
    @@ -13,13 +13,13 @@
    diff --git a/admin/src/admin/views/MenuViews.py b/admin/src/admin/views/MenuViews.py index 66b6692..c0baa1f 100644 --- a/admin/src/admin/views/MenuViews.py +++ b/admin/src/admin/views/MenuViews.py @@ -9,45 +9,45 @@ import time,json import sys,os from flask import render_template, Response, request, redirect, url_for, jsonify -@app.route('/dd-admin/users') +@app.route('/isard-sso-admin/users') # @login_required def users(): return render_template('pages/users.html', title="Users", nav="Users") -@app.route('/dd-admin/users_list') +@app.route('/isard-sso-admin/users_list') # @login_required def users_list(): return json.dumps(app.admin.get_mix_users()), 200, {'Content-Type': 'application/json'} -@app.route('/dd-admin/roles') +@app.route('/isard-sso-admin/roles') # @login_required def roles(): return render_template('pages/roles.html', title="Roles", nav="Roles") -@app.route('/dd-admin/roles_list') +@app.route('/isard-sso-admin/roles_list') # @login_required def roles_list(): return json.dumps(app.admin.get_roles()), 200, {'Content-Type': 'application/json'} -@app.route('/dd-admin/groups') +@app.route('/isard-sso-admin/groups') # @login_required def groups(): return render_template('pages/groups.html', title="Groups", nav="Groups") -@app.route('/dd-admin/groups_list') +@app.route('/isard-sso-admin/groups_list') # @login_required def groups_list(): return json.dumps(app.admin.get_groups()), 200, {'Content-Type': 'application/json'} -@app.route('/dd-admin/external') +@app.route('/isard-sso-admin/external') # @login_required def external(): return render_template('pages/external.html', title="External", nav="External") -@app.route('/dd-admin/external_users_list') +@app.route('/isard-sso-admin/external_users_list') # @login_required def external_list(): return json.dumps(app.admin.get_external_users()), 200, {'Content-Type': 'application/json'} \ No newline at end of file diff --git a/docker-compose-parts/admin.yml b/docker-compose-parts/admin.yml index 29a7d2a..d1293dc 100644 --- a/docker-compose-parts/admin.yml +++ b/docker-compose-parts/admin.yml @@ -1,7 +1,7 @@ version: '3.7' services: - dd-admin: - container_name: dd-admin + isard-sso-admin: + container_name: isard-sso-admin build: context: ${BUILD_ROOT_PATH} dockerfile: admin/docker/Dockerfile diff --git a/docker-compose-parts/backup.yml b/docker-compose-parts/backup.yml index 86fc6f6..c6fedfd 100644 --- a/docker-compose-parts/backup.yml +++ b/docker-compose-parts/backup.yml @@ -1,6 +1,6 @@ version: '3.7' services: - dd-backups: + isard-sso-backups: container_name: dd-backups image: prodrigestivill/postgres-backup-local restart: always diff --git a/docker/haproxy/haproxy.conf b/docker/haproxy/haproxy.conf index 2794d71..8c20684 100644 --- a/docker/haproxy/haproxy.conf +++ b/docker/haproxy/haproxy.conf @@ -47,7 +47,7 @@ frontend website use_backend be_oof if is_oof use_backend be_wp if is_wp use_backend be_etherpad if is_pad - use_backend be_admin if is_sso { path_beg /dd-admin } + use_backend be_admin if is_sso { path_beg /isard-sso-admin } use_backend be_sso if is_sso use_backend be_ipa if is_ipa use_backend be_api if is_api @@ -87,7 +87,7 @@ backend be_admin acl existing-x-forwarded-proto req.hdr(X-Forwarded-Proto) -m found http-request add-header X-Forwarded-Host %[req.hdr(Host)] unless existing-x-forwarded-host http-request add-header X-Forwarded-Proto https unless existing-x-forwarded-proto - server dd-admin dd-admin:9000 check port 9000 inter 5s rise 2 fall 10 resolvers mydns init-addr none + server isard-sso-admin isard-sso-admin:9000 check port 9000 inter 5s rise 2 fall 10 resolvers mydns init-addr none ## APPS backend be_moodle