Open Build Service

python-django-eagle.changes Changed

python-django-eagle.spec Changed

@@ -19,7 +19,7 @@
 %define skip_python2 1
 %{?!primary_python:%define primary_python python3}
 Name:           python-django-eagle
-Version:        2.1.43
+Version:        2.1.44
 Release:        0
 Summary:        A Django application for serving eagle.sai.msu.ru
 License:        BSD-2-Clause
@@ -33,6 +33,8 @@
 BuildRequires:  %{python_module django-collectd-rest >= 0.1.9}
 BuildRequires:  %{python_module django-eremaea2 < 2.1}
 BuildRequires:  %{python_module django-webpack-loader >= 1.0.0}
+BuildRequires:  %{python_module dynaconf}
+BuildRequires:  %{python_module ruamel.yaml}
 BuildRequires:  nginx
 BuildRequires:  systemd
 %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3"
@@ -42,6 +44,8 @@
 Requires:       python-django-collectd-rest >= 0.1.9
 Requires:       python-django-eremaea2 < 2.1
 Requires:       python-django-webpack-loader >= 1.0.0
+Requires:       python-dynaconf
+Requires:       python-ruamel.yaml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %python_subpackages
 
@@ -71,7 +75,7 @@
 %install
 %python_install
 STATIC_ROOT=%{buildroot}/srv/www/django-eagle/static python3 manage.py collectstatic --noinput
-install -D -m 0644 local_settings.py %{buildroot}%{_sysconfdir}/django-eagle/local_settings.py
+install -D -m 0644 settings.yaml %{buildroot}%{_sysconfdir}/django-eagle/settings.yaml
 install -D -m 0644 nginx_vhost.conf %{buildroot}%{_sysconfdir}/nginx/vhosts.d/django-eagle.conf
 install -D -m 0644 django-eagle.socket %{buildroot}%{_unitdir}/django-eagle.socket
 install -D -m 0644 django-eagle.service %{buildroot}%{_unitdir}/django-eagle.service
@@ -103,7 +107,7 @@
 %files -n django-eagle
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/django-eagle
-%attr(0600,django_eagle,django_eagle) %config %{_sysconfdir}/django-eagle/local_settings.py
+%attr(0600,django_eagle,django_eagle) %config %{_sysconfdir}/django-eagle/settings.yaml
 %dir %{_sysconfdir}/nginx/vhosts.d
 %config %{_sysconfdir}/nginx/vhosts.d/django-eagle.conf
 %{_unitdir}/django-eagle.socket

django-eagle-2.1.43.tar.gz/local_settings.py Deleted

django-eagle-2.1.43.tar.gz/MANIFEST.in -> django-eagle-2.1.44.tar.gz/MANIFEST.in Changed

django-eagle-2.1.43.tar.gz/PKG-INFO -> django-eagle-2.1.44.tar.gz/PKG-INFO Changed

django-eagle-2.1.43.tar.gz/django-eagle.service -> django-eagle-2.1.44.tar.gz/django-eagle.service Changed

django-eagle-2.1.43.tar.gz/django_eagle.egg-info/PKG-INFO -> django-eagle-2.1.44.tar.gz/django_eagle.egg-info/PKG-INFO Changed

django-eagle-2.1.43.tar.gz/django_eagle.egg-info/SOURCES.txt -> django-eagle-2.1.44.tar.gz/django_eagle.egg-info/SOURCES.txt Changed

django-eagle-2.1.43.tar.gz/django_eagle/settings.py -> django-eagle-2.1.44.tar.gz/django_eagle/settings.py Changed

@@ -19,15 +19,12 @@
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = "PRODUCTION" not in os.environ
+DEBUG = True
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 't_-s%=h6_&s0c@(fqxiw@15-dt*#*qj5_%lv@u@s9#-#3-lf7g'
-if not DEBUG:
-    SECRET_KEY = ''
-SECRET_KEY = os.getenv("SECRET_KEY", default=SECRET_KEY)
+SECRET_KEY = "Debug-Secret"
 
-ALLOWED_HOSTS = os.getenv("ALLOWED_HOSTS", default="").split(",")
+ALLOWED_HOSTS = "*"
 
 # Application definition
 
@@ -137,11 +134,21 @@
 
 # Trust X-Forwarded-Proto
 # https://docs.djangoproject.com/en/1.9/ref/settings/#secure-proxy-ssl-header
+
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
+
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-if not DEBUG:
-    from local_settings import *
+
+# HERE STARTS DYNACONF EXTENSION LOAD (Keep at the very bottom of settings.py)
+# Read more at https://www.dynaconf.com/django/
+import dynaconf  # noqa
+settings = dynaconf.DjangoDynaconf(__name__,
+    environments=False,
+    ENVVAR_PREFIX_FOR_DYNACONF='DJANGO_EAGLE',
+    SETTINGS_FILE_FOR_DYNACONF='/etc/django-eagle/settings.yaml',
+    )  # noqa
+# HERE ENDS DYNACONF EXTENSION LOAD (No more code below this line)

django-eagle-2.1.43.tar.gz/package.json -> django-eagle-2.1.44.tar.gz/package.json Changed

django-eagle-2.1.44.tar.gz/settings.yaml Added

django-eagle-2.1.43.tar.gz/setup.py -> django-eagle-2.1.44.tar.gz/setup.py Changed

Changes of Revision 44