diff --git a/debian/agent/settings.py b/debian/agent/settings.py index e73bde7..142bcf6 100644 --- a/debian/agent/settings.py +++ b/debian/agent/settings.py @@ -23,9 +23,7 @@ COMBO_MANAGE_COMMAND = 'sudo -u combo /usr/bin/combo-manage' PASSERELLE_MANAGE_COMMAND = 'sudo -u passerelle /usr/bin/passerelle-manage' FARGO_MANAGE_COMMAND = 'sudo -u fargo /usr/bin/fargo-manage' WELCO_MANAGE_COMMAND = 'sudo -u welco /usr/bin/welco-manage' -MANDAYEJS_MANAGE_COMMAND = 'sudo -u mandayejs /usr/bin/mandayejs-manage' CHRONO_MANAGE_COMMAND = 'sudo -u chrono /usr/bin/chrono-manage' -CORBO_MANAGE_COMMAND = 'sudo -u corbo /usr/bin/corbo-manage' BIJOE_MANAGE_COMMAND = 'sudo -u bijoe /usr/bin/bijoe-manage' HOBO_MANAGE_COMMAND = 'sudo -u hobo /usr/bin/hobo-manage' diff --git a/debian/agent/sudo-hobo-agent b/debian/agent/sudo-hobo-agent index 1c9c104..aa1df7e 100644 --- a/debian/agent/sudo-hobo-agent +++ b/debian/agent/sudo-hobo-agent @@ -4,9 +4,7 @@ hobo-agent ALL=(combo)NOPASSWD:/usr/bin/combo-manage hobo_deploy * - hobo-agent ALL=(passerelle)NOPASSWD:/usr/bin/passerelle-manage hobo_deploy * - hobo-agent ALL=(fargo)NOPASSWD:/usr/bin/fargo-manage hobo_deploy * - hobo-agent ALL=(welco)NOPASSWD:/usr/bin/welco-manage hobo_deploy * - -hobo-agent ALL=(mandayejs)NOPASSWD:/usr/bin/mandayejs-manage hobo_deploy * - hobo-agent ALL=(chrono)NOPASSWD:/usr/bin/chrono-manage hobo_deploy * - -hobo-agent ALL=(corbo)NOPASSWD:/usr/bin/corbo-manage hobo_deploy * - hobo-agent ALL=(bijoe)NOPASSWD:/usr/bin/bijoe-manage hobo_deploy * - hobo-agent ALL=(hobo)NOPASSWD:/usr/bin/hobo-manage hobo_deploy * - @@ -16,8 +14,6 @@ hobo-agent ALL=(combo)NOPASSWD:/usr/bin/combo-manage hobo_notify - hobo-agent ALL=(passerelle)NOPASSWD:/usr/bin/passerelle-manage hobo_notify - hobo-agent ALL=(fargo)NOPASSWD:/usr/bin/fargo-manage hobo_notify - hobo-agent ALL=(welco)NOPASSWD:/usr/bin/welco-manage hobo_notify - -hobo-agent ALL=(mandayejs)NOPASSWD:/usr/bin/mandayejs-manage hobo_notify - hobo-agent ALL=(chrono)NOPASSWD:/usr/bin/chrono-manage hobo_notify - -hobo-agent ALL=(corbo)NOPASSWD:/usr/bin/corbo-manage hobo_notify - hobo-agent ALL=(bijoe)NOPASSWD:/usr/bin/bijoe-manage hobo_notify - hobo-agent ALL=(hobo)NOPASSWD:/usr/bin/hobo-manage hobo_notify - diff --git a/hobo/agent/worker/services.py b/hobo/agent/worker/services.py index 7976b05..196de52 100644 --- a/hobo/agent/worker/services.py +++ b/hobo/agent/worker/services.py @@ -169,20 +169,6 @@ class Welco(BaseService): tenants_dir = settings.WELCO_TENANTS_DIRECTORY -class Mandayejs(BaseService): - service_id = 'mandayejs' - service_manage_cmd = settings.MANDAYEJS_MANAGE_COMMAND - service_manage_try_cmd = settings.MANDAYEJS_MANAGE_TRY_COMMAND - tenants_dir = settings.MANDAYEJS_TENANTS_DIRECTORY - - -class Corbo(BaseService): - service_id = 'corbo' - service_manage_cmd = settings.CORBO_MANAGE_COMMAND - service_manage_try_cmd = settings.CORBO_MANAGE_TRY_COMMAND - tenants_dir = settings.CORBO_TENANTS_DIRECTORY - - class BiJoe(BaseService): service_id = 'bijoe' service_manage_cmd = settings.BIJOE_MANAGE_COMMAND diff --git a/hobo/agent/worker/settings.py b/hobo/agent/worker/settings.py index 8144201..d933285 100644 --- a/hobo/agent/worker/settings.py +++ b/hobo/agent/worker/settings.py @@ -23,9 +23,7 @@ COMBO_MANAGE_COMMAND = '/usr/lib/combo/manage.py' PASSERELLE_MANAGE_COMMAND = '/usr/lib/passerelle/manage.py' FARGO_MANAGE_COMMAND = '/usr/bin/fargo-manage' WELCO_MANAGE_COMMAND = '/usr/bin/welco-manage' -MANDAYEJS_MANAGE_COMMAND = '/usr/bin/mandayejs-manage' CHRONO_MANAGE_COMMAND = '/usr/bin/chrono-manage' -CORBO_MANAGE_COMMAND = '/usr/bin/corbo-manage' HOBO_MANAGE_COMMAND = '/usr/bin/hobo-manage' BIJOE_MANAGE_COMMAND = '/usr/bin/bijoe-manage' @@ -36,8 +34,6 @@ PASSERELLE_MANAGE_TRY_COMMAND = PASSERELLE_MANAGE_COMMAND FARGO_MANAGE_TRY_COMMAND = FARGO_MANAGE_COMMAND CHRONO_MANAGE_TRY_COMMAND = CHRONO_MANAGE_COMMAND WELCO_MANAGE_TRY_COMMAND = WELCO_MANAGE_COMMAND -MANDAYEJS_MANAGE_TRY_COMMAND = MANDAYEJS_MANAGE_COMMAND -CORBO_MANAGE_TRY_COMMAND = CORBO_MANAGE_COMMAND HOBO_MANAGE_TRY_COMMAND = HOBO_MANAGE_COMMAND BIJOE_MANAGE_TRY_COMMAND = BIJOE_MANAGE_COMMAND @@ -48,8 +44,6 @@ CHRONO_TENANTS_DIRECTORY = '/var/lib/chrono/tenants' COMBO_TENANTS_DIRECTORY = '/var/lib/combo/tenants' FARGO_TENANTS_DIRECTORY = '/var/lib/fargo/tenants' WELCO_TENANTS_DIRECTORY = '/var/lib/welco/tenants' -MANDAYEJS_TENANTS_DIRECTORY = '/var/lib/mandayejs/tenants' -CORBO_TENANTS_DIRECTORY = '/var/lib/corbo/tenants' BIJOE_TENANTS_DIRECTORY = '/var/lib/bijoe/tenants' HOBO_TENANTS_DIRECTORY = '/var/lib/hobo/tenants' diff --git a/hobo/environment/forms.py b/hobo/environment/forms.py index b54f30c..c754eac 100644 --- a/hobo/environment/forms.py +++ b/hobo/environment/forms.py @@ -23,7 +23,7 @@ from django.utils.translation import ugettext_lazy as _ from .models import (Authentic, Wcs, Passerelle, Variable, Combo, Fargo, Welco, - MandayeJS, Chrono, Corbo, BiJoe, Hobo) + Chrono, BiJoe, Hobo) from .utils import get_variable from .validators import validate_service_url @@ -133,24 +133,12 @@ class WelcoForm(BaseForm): exclude = EXCLUDED_FIELDS -class MandayeJSForm(BaseForm): - class Meta: - model = MandayeJS - exclude = EXCLUDED_FIELDS - - class ChronoForm(BaseForm): class Meta: model = Chrono exclude = EXCLUDED_FIELDS -class CorboForm(BaseForm): - class Meta: - model = Corbo - exclude = EXCLUDED_FIELDS - - class BiJoeForm(BaseForm): class Meta: model = BiJoe diff --git a/hobo/environment/management/commands/cook.py b/hobo/environment/management/commands/cook.py index f82fce7..63dd2b8 100644 --- a/hobo/environment/management/commands/cook.py +++ b/hobo/environment/management/commands/cook.py @@ -38,7 +38,7 @@ from hobo.agent.common.management.commands.hobo_deploy import ( Command as HoboDeployCommand) from hobo.multitenant.middleware import TenantMiddleware from hobo.environment.models import (AVAILABLE_SERVICES, Authentic, Wcs, Hobo, - Passerelle, Combo, Fargo, Welco, MandayeJS, Chrono, Corbo, BiJoe, + Passerelle, Combo, Fargo, Welco, Chrono, BiJoe, Variable, AUTO_VARIABLES) from hobo.environment.validators import validate_service_url from hobo.deploy.signals import notify_agents @@ -257,9 +257,6 @@ class Command(BaseCommand): def create_chrono(self, url, title, slug=None, template_name='', variables=None, **kwargs): return self.create_site(Chrono, url, title, slug, template_name, variables) - def create_corbo(self, url, title, slug=None, template_name='', variables=None, **kwargs): - return self.create_site(Corbo, url, title, slug, template_name, variables) - def create_bijoe(self, url, title, slug=None, template_name='', variables=None, **kwargs): return self.create_site(BiJoe, url, title, slug, template_name, variables) diff --git a/hobo/environment/mandayejs_app_settings.py b/hobo/environment/mandayejs_app_settings.py deleted file mode 100644 index 45842cb..0000000 --- a/hobo/environment/mandayejs_app_settings.py +++ /dev/null @@ -1,11 +0,0 @@ -# List of MandayeJS App Settings Classes - -APP_SETTINGS_CLASSES = ( - ('mandayejs.applications.Test', 'Test'), - ('mandayejs.applications.Duonet', 'Duonet'), - ('mandayejs.applications.Sezhame', 'Sezhame'), - ('mandayejs.applications.Archimed', 'Archimed'), - ('mandayejs.applications.ImuseFamilyMontpellier', 'ImuseFamilyMontpellier'), -) - -DEFAULT_APP_SETTINGS = APP_SETTINGS_CLASSES[0][0] diff --git a/hobo/environment/migrations/0020_delete_corbo_mandaye.py b/hobo/environment/migrations/0020_delete_corbo_mandaye.py new file mode 100644 index 0000000..99801d9 --- /dev/null +++ b/hobo/environment/migrations/0020_delete_corbo_mandaye.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.29 on 2021-02-28 09:57 +from __future__ import unicode_literals + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('environment', '0019_delete_piwik'), + ] + + operations = [ + migrations.DeleteModel( + name='Corbo', + ), + migrations.DeleteModel( + name='MandayeJS', + ), + ] diff --git a/hobo/environment/models.py b/hobo/environment/models.py index cf8a1c8..8f90d66 100644 --- a/hobo/environment/models.py +++ b/hobo/environment/models.py @@ -37,7 +37,6 @@ from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation from .utils import Zone, get_installed_services -from .mandayejs_app_settings import APP_SETTINGS_CLASSES, DEFAULT_APP_SETTINGS SECRET_CHARS = 'abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)' FLOAT_RE = re.compile(r'^\s*[0-9]+\.[0-9]+\s*') @@ -431,35 +430,6 @@ class Welco(ServiceBase): return self.get_base_url_path() + 'menu.json' -class MandayeJS(ServiceBase): - site_app = models.CharField( - _('Site Application'), - max_length=128, - choices=APP_SETTINGS_CLASSES, - default=DEFAULT_APP_SETTINGS) - - class Meta: - verbose_name = _('Authentication Reverse Proxy') - ordering = ['title'] - - class Extra: - service_id = 'mandayejs' - service_label = _('mandayejs') - service_default_slug = 'mandayejs' - - @classmethod - def is_enabled(cls): - return getattr(settings, 'MANDAYEJS_ENABLED', False) - - def get_admin_zones(self): - return [ - Zone(self.title, 'mandayejs', self.get_base_url_path() + '_mandaye/admin/') - ] - - def get_saml_sp_metadata_url(self): - return self.get_base_url_path() + '_mandaye/accounts/mellon/metadata/' - - class Chrono(ServiceBase): class Meta: verbose_name = _('Chrono Agendas') @@ -506,33 +476,6 @@ class Hobo(ServiceBase): return None -class Corbo(ServiceBase): - class Meta: - verbose_name = _('Announces Management') - verbose_name_plural = _('Announces Management') - ordering = ['title'] - - class Extra: - service_id = 'corbo' - service_label = _('Corbo') - service_default_slug = 'announces' - - @classmethod - def is_enabled(cls): - return getattr(settings, 'CORBO_ENABLED', False) - - def get_admin_zones(self): - return [ - Zone(self.title, 'corbo', self.get_base_url_path() + 'admin/') - ] - - def get_saml_sp_metadata_url(self): - return self.get_base_url_path() + 'accounts/mellon/metadata/' - - def get_backoffice_menu_url(self): - return self.get_base_url_path() + 'manage/menu.json' - - class BiJoe(ServiceBase): class Meta: verbose_name = _('Statistics') @@ -557,4 +500,4 @@ class BiJoe(ServiceBase): AVAILABLE_SERVICES = [Authentic, Wcs, Passerelle, Combo, Fargo, Welco, - MandayeJS, Chrono, Corbo, BiJoe, Hobo] + Chrono, BiJoe, Hobo] diff --git a/hobo/multitenant/settings_loaders.py b/hobo/multitenant/settings_loaders.py index 1ff981e..5f0d45a 100644 --- a/hobo/multitenant/settings_loaders.py +++ b/hobo/multitenant/settings_loaders.py @@ -372,15 +372,6 @@ class Mellon(FileBaseSettingsLoader): tenant_settings.MELLON_PRIVATE_KEY = saml_key -class MandayeJS(FileBaseSettingsLoader): - FILENAME = 'hobo.json' - - def update_settings(self, tenant_settings, tenant): - service = tenant.get_service() - if service.get('site_app', None): - tenant_settings.SITE_APP = service['site_app'] - - class SiteBaseUrl(object): def get_new_time(self, tenant): tenant_dir = os.path.join(settings.TENANT_BASE, tenant.domain_url) diff --git a/hobo/scrutiny/wsgi/middleware.py b/hobo/scrutiny/wsgi/middleware.py index 8bb74dc..6d7458c 100644 --- a/hobo/scrutiny/wsgi/middleware.py +++ b/hobo/scrutiny/wsgi/middleware.py @@ -27,11 +27,7 @@ class VersionMiddleware(MiddlewareMixin): 'portail-citoyen2', 'portail-citoyen-announces', 'django-cms-ajax-text-plugin', - 'mandaye', 'eopayment', - 'mandaye-cam', - 'mandaye-meyzieu', - 'mandaye-vincennes', 'compte-meyzieu', 'compte-agglo-montpellier', 'compte-orleans', @@ -40,10 +36,8 @@ class VersionMiddleware(MiddlewareMixin): 'combo', 'lingo', 'fargo', - 'corbo', 'welco', 'chrono', - 'corbo', ] VERSION = 1 _packages_version = None diff --git a/hobo/static/css/style.scss b/hobo/static/css/style.scss index 8f6bcb2..e03df41 100644 --- a/hobo/static/css/style.scss +++ b/hobo/static/css/style.scss @@ -16,7 +16,6 @@ div.wcs-block { background-image: url(../img/icon-webforms.png); } div.passerelle-block { background-image: url(icons/connector.large.png); } div.combo-block { background-image: url(icons/portal.large.png); } div.chrono-block { background-image: url(icons/calendar.large.png); } -div.corbo-block { background-image: url(icons/announces.large.png); } p.being-deployed { background: url(indicator.gif) no-repeat; diff --git a/tests/test_cook.py b/tests/test_cook.py index e2dff1d..456a217 100644 --- a/tests/test_cook.py +++ b/tests/test_cook.py @@ -9,7 +9,7 @@ from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.core.management.base import CommandError -from hobo.environment.models import (Authentic, BiJoe, Chrono, Combo, Corbo, Fargo, +from hobo.environment.models import (Authentic, BiJoe, Chrono, Combo, Fargo, Hobo, Passerelle, ServiceBase, Variable, Wcs, Welco) from hobo.environment.management.commands.cook import Command from hobo.profile.models import AttributeDefinition @@ -363,10 +363,9 @@ def test_create_services(): command.create_fargo('url', 'title') command.create_welco('url', 'title') command.create_chrono('url', 'title') - command.create_corbo('url', 'title') command.create_bijoe('url', 'title') - assert len(command.create_site.mock_calls) == 9 + assert len(command.create_site.mock_calls) == 8 assert command.create_site.mock_calls == [ call(Authentic, 'url', 'title', None, '', None), call(Combo, 'url', 'title', None, '', None), @@ -375,7 +374,6 @@ def test_create_services(): call(Fargo, 'url', 'title', None, '', None), call(Welco, 'url', 'title', None, '', None), call(Chrono, 'url', 'title', None, '', None), - call(Corbo, 'url', 'title', None, '', None), call(BiJoe, 'url', 'title', None, '', None)] def test_set_idp(db):