From 0eb766051c80cee06bc8d3f72aafa98342e3a6e8 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Mon, 2 Mar 2020 16:51:00 +0100 Subject: [PATCH] Restructure gvaweb to correct package paths --- .gitignore | 1 + docs/install.rst | 1 - {gvaweb/gvacommon => gvacommon}/.gitignore | 0 {gvaweb/gvacommon => gvacommon}/__init__.py | 0 .../gvacommon => gvacommon}/celeryrouters.py | 4 -- gvaweb/{gvaweb/celery.py => __init__.py} | 4 +- gvaweb/gvacommon/viewmixins.py | 42 ------------------- gvaweb/gvaweb/__init__.py | 0 gvaweb/{gvaweb => }/settings.py | 1 - gvaweb/webtasks/tasks.py | 4 +- 10 files changed, 3 insertions(+), 54 deletions(-) rename {gvaweb/gvacommon => gvacommon}/.gitignore (100%) rename {gvaweb/gvacommon => gvacommon}/__init__.py (100%) rename {gvaweb/gvacommon => gvacommon}/celeryrouters.py (90%) rename gvaweb/{gvaweb/celery.py => __init__.py} (71%) delete mode 100644 gvaweb/gvacommon/viewmixins.py delete mode 100644 gvaweb/gvaweb/__init__.py rename gvaweb/{gvaweb => }/settings.py (95%) diff --git a/.gitignore b/.gitignore index da9d74b..844016f 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ _build/ *.sqlite3 .idea/ .vagrant/ +.env diff --git a/docs/install.rst b/docs/install.rst index baf63d2..b7d9eec 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -30,7 +30,6 @@ into the gvaweb directory and run the celery worker with: .. code-block:: sh - $ cd gvaweb $ pipenv run celery -A gvaweb worker -Q web -l info .. _Celery: http://www.celeryproject.org/ diff --git a/gvaweb/gvacommon/.gitignore b/gvacommon/.gitignore similarity index 100% rename from gvaweb/gvacommon/.gitignore rename to gvacommon/.gitignore diff --git a/gvaweb/gvacommon/__init__.py b/gvacommon/__init__.py similarity index 100% rename from gvaweb/gvacommon/__init__.py rename to gvacommon/__init__.py diff --git a/gvaweb/gvacommon/celeryrouters.py b/gvacommon/celeryrouters.py similarity index 90% rename from gvaweb/gvacommon/celeryrouters.py rename to gvacommon/celeryrouters.py index 44c4b4f..f5d8703 100644 --- a/gvaweb/gvacommon/celeryrouters.py +++ b/gvacommon/celeryrouters.py @@ -1,9 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - - class GvaRouter(object): - def route_for_task(self, task, args=None, kwargs=None): for route in ['ldap', 'file', 'mysql', 'pgsql', 'web']: if route in task: diff --git a/gvaweb/gvaweb/celery.py b/gvaweb/__init__.py similarity index 71% rename from gvaweb/gvaweb/celery.py rename to gvaweb/__init__.py index be72e8c..ebf6b6f 100644 --- a/gvaweb/gvaweb/celery.py +++ b/gvaweb/__init__.py @@ -4,12 +4,10 @@ This module defines the Celery_ app for gvaweb. .. _Celery: http://www.celeryproject.org/ """ -from __future__ import absolute_import - from celery import Celery #: The Celery application app = Celery('gvaweb') app.config_from_object('gvaweb.settings') -app.autodiscover_tasks(['webtasks'], force=True) +app.autodiscover_tasks(['gvaweb.webtasks'], force=True) diff --git a/gvaweb/gvacommon/viewmixins.py b/gvaweb/gvacommon/viewmixins.py deleted file mode 100644 index fc7f106..0000000 --- a/gvaweb/gvacommon/viewmixins.py +++ /dev/null @@ -1,42 +0,0 @@ -""" -This module defines mixins for gnuviechadmin views. - -""" -from __future__ import unicode_literals - -from django.http import HttpResponseForbidden -from django.utils.translation import ugettext as _ - -from braces.views import LoginRequiredMixin - - -class StaffOrSelfLoginRequiredMixin(LoginRequiredMixin): - """ - Mixin that makes sure that a user is logged in and matches the current - customer or is a staff user. - - """ - - def dispatch(self, request, *args, **kwargs): - if ( - request.user.is_staff or - request.user == self.get_customer_object() - ): - return super(StaffOrSelfLoginRequiredMixin, self).dispatch( - request, *args, **kwargs - ) - return HttpResponseForbidden( - _('You are not allowed to view this page.') - ) - - def get_customer_object(self): - """ - Views based on this mixin have to implement this method to return - the customer that must be an object of the same class as the - django.contrib.auth user type. - - :return: customer - :rtype: settings.AUTH_USER_MODEL - - """ - raise NotImplemented("subclass has to implement get_customer_object") diff --git a/gvaweb/gvaweb/__init__.py b/gvaweb/gvaweb/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/gvaweb/gvaweb/settings.py b/gvaweb/settings.py similarity index 95% rename from gvaweb/gvaweb/settings.py rename to gvaweb/settings.py index 48db56a..f31cf6c 100644 --- a/gvaweb/gvaweb/settings.py +++ b/gvaweb/settings.py @@ -42,6 +42,5 @@ BROKER_URL = get_env_setting('GVAWEB_BROKER_URL') ########## GVAWEB CONFIGURATION GVAWEB_NGINX_SITES_AVAILABLE = get_env_setting('GVAWEB_NGINX_SITES_AVAILABLE') GVAWEB_NGINX_SITES_ENABLED = get_env_setting('GVAWEB_NGINX_SITES_ENABLED') -GVAWEB_PHPFPM_POOL = get_env_setting('GVAWEB_PHPFPM_POOL') GVAWEB_WWWUSER_MOUNT = get_env_setting('GVAWEB_WWWUSER_MOUNT') ########## END GVAWEB CONFIGURATION diff --git a/gvaweb/webtasks/tasks.py b/gvaweb/webtasks/tasks.py index bd2d28e..7fc0d06 100644 --- a/gvaweb/webtasks/tasks.py +++ b/gvaweb/webtasks/tasks.py @@ -2,8 +2,6 @@ This module defines Celery_ tasks to manage website configurations. """ -from __future__ import absolute_import - import os import subprocess from tempfile import mkstemp @@ -24,7 +22,7 @@ LN_CMD = '/bin/ln' SERVICE_CMD = '/bin/systemctl' INSTALL_CMD = '/usr/bin/install' -JINJAENV = Environment(loader=PackageLoader('webtasks', 'templates')) +JINJAENV = Environment(loader=PackageLoader('gvaweb.webtasks', 'templates')) def _jinja_parentdomain(domain):