diff --git a/.gitignore b/.gitignore index a6e9d00..feb0ad5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ __pycache__/ db.sqlite3 media/ +result diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..9238f3a --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,6 @@ +graft common_files/templates +graft common_files/static +graft site_statique/static +graft site_statique/templates +graft timeline/templates +graft timeline/static diff --git a/default.nix b/default.nix index 08a7788..7c23f39 100644 --- a/default.nix +++ b/default.nix @@ -20,6 +20,10 @@ pkgs.python3.pkgs.buildPythonPackage rec { doCheck = false; + postInstall = '' + python $out/bin/manage.py collectstatic + ''; + meta = { description = "Site de présentation de l'association Musique Fraternité de Meyenheim"; homepage = https://musique-meyenheim.fr; diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..1197e16 --- /dev/null +++ b/setup.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python +from setuptools import setup, find_packages + +setup(name='site_musique', + version='1.0', + packages=find_packages(), + scripts=['manage.py'], + include_package_data=True) diff --git a/site_musique/settings/base.py b/site_musique/settings/base.py index d5501e7..71bb22e 100644 --- a/site_musique/settings/base.py +++ b/site_musique/settings/base.py @@ -19,13 +19,6 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__fil # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '%y$(+on3*nzj0*fnq-@#=u4w_x-$4=l12+9be^xbq92nj5%0cd' - -# SECURITY WARNING: don't run with debug turned on in production! - -ALLOWED_HOSTS = [] - # Application definition INSTALLED_APPS = [ @@ -89,5 +82,4 @@ USE_TZ = True STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') -MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' diff --git a/site_musique/settings/dev.py b/site_musique/settings/dev.py index 1ea3e87..c55155b 100644 --- a/site_musique/settings/dev.py +++ b/site_musique/settings/dev.py @@ -2,6 +2,10 @@ from .base import * DEBUG = True +ALLOWED_HOSTS = [] + +SECRET_KEY = '%y$(+on3*nzj0*fnq-@#=u4w_x-$4=l12+9be^xbq92nj5%0cd' + # Database # https://docs.djangoproject.com/en/1.11/ref/settings/#databases @@ -11,3 +15,5 @@ DATABASES = { 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), } } + +MEDIA_ROOT = os.path.join(BASE_DIR, 'media') diff --git a/site_musique/settings/prod.py b/site_musique/settings/prod.py index 94c5cd9..bfc4435 100644 --- a/site_musique/settings/prod.py +++ b/site_musique/settings/prod.py @@ -17,3 +17,20 @@ AUTH_PASSWORD_VALIDATORS = [ 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', }, ] + +DEBUG = False + +ALLOWED_HOSTS = ["musique-meyenheim.fr"] + +SECRET_KEY = os.environ['SECRET_KEY'] + +VAR_DIR = os.environ['VAR_DIR'] + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(VAR_DIR, 'db.sqlite3'), + } +} + +MEDIA_ROOT = os.path.join(VAR_DIR, 'media') diff --git a/site_musique/urls.py b/site_musique/urls.py index 9e94ca4..800ec3e 100644 --- a/site_musique/urls.py +++ b/site_musique/urls.py @@ -17,7 +17,7 @@ from django.contrib import admin from django.urls import include, path from django.contrib.staticfiles.urls import static from django.contrib.staticfiles.urls import staticfiles_urlpatterns -from .settings import base as settings +from django.conf import settings urlpatterns = [ path('evenements/', include('timeline.urls')),