From 9bed1a56e49e53cd4f1b6d116298c48586fd395c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sun, 4 Dec 2016 23:46:27 +0100 Subject: [PATCH] Mv scripts to bin --- .gitignore | 6 +----- {scripts => bin}/collectstatic.sh | 0 {scripts => bin/db}/backup_db.sh | 0 {scripts => bin/db}/backup_db_eve.sh | 0 {scripts => bin/db}/backup_db_mysql.sh | 0 {scripts => bin/db}/restore_db.sh | 0 {scripts => bin/db}/restore_db_eve.sh | 0 {scripts => bin/db}/restore_db_mysql.sh | 0 bin/graph_model.sh | 3 +++ install.py => bin/install.py | 0 {scripts => bin}/makemigrations.sh | 0 {scripts => bin}/migrate.sh | 0 {scripts => bin}/pf_osx.sh | 0 {scripts => bin}/pull.sh | 0 {scripts => bin}/push.sh | 0 {scripts => bin/tmp}/fs_migrate.sh | 5 ----- {scripts => bin}/upgrade.sh | 0 etc/{ => apt}/sources.list | 0 etc/nginx/conf.d/default.conf | 26 +++++++++++++++++++++++++ 19 files changed, 30 insertions(+), 10 deletions(-) rename {scripts => bin}/collectstatic.sh (100%) rename {scripts => bin/db}/backup_db.sh (100%) rename {scripts => bin/db}/backup_db_eve.sh (100%) rename {scripts => bin/db}/backup_db_mysql.sh (100%) rename {scripts => bin/db}/restore_db.sh (100%) rename {scripts => bin/db}/restore_db_eve.sh (100%) rename {scripts => bin/db}/restore_db_mysql.sh (100%) create mode 100755 bin/graph_model.sh rename install.py => bin/install.py (100%) rename {scripts => bin}/makemigrations.sh (100%) rename {scripts => bin}/migrate.sh (100%) rename {scripts => bin}/pf_osx.sh (100%) rename {scripts => bin}/pull.sh (100%) rename {scripts => bin}/push.sh (100%) rename {scripts => bin/tmp}/fs_migrate.sh (55%) rename {scripts => bin}/upgrade.sh (100%) rename etc/{ => apt}/sources.list (100%) create mode 100644 etc/nginx/conf.d/default.conf diff --git a/.gitignore b/.gitignore index 249157e1..7645dc4c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,19 +8,15 @@ build eggs parts -bin sdist develop-eggs .installed.cfg *.directory var -data/static -data/mysql -data/postgresql -data/var .thumbnails .tmp doc +*.lock # Installer logs pip-log.txt diff --git a/scripts/collectstatic.sh b/bin/collectstatic.sh similarity index 100% rename from scripts/collectstatic.sh rename to bin/collectstatic.sh diff --git a/scripts/backup_db.sh b/bin/db/backup_db.sh similarity index 100% rename from scripts/backup_db.sh rename to bin/db/backup_db.sh diff --git a/scripts/backup_db_eve.sh b/bin/db/backup_db_eve.sh similarity index 100% rename from scripts/backup_db_eve.sh rename to bin/db/backup_db_eve.sh diff --git a/scripts/backup_db_mysql.sh b/bin/db/backup_db_mysql.sh similarity index 100% rename from scripts/backup_db_mysql.sh rename to bin/db/backup_db_mysql.sh diff --git a/scripts/restore_db.sh b/bin/db/restore_db.sh similarity index 100% rename from scripts/restore_db.sh rename to bin/db/restore_db.sh diff --git a/scripts/restore_db_eve.sh b/bin/db/restore_db_eve.sh similarity index 100% rename from scripts/restore_db_eve.sh rename to bin/db/restore_db_eve.sh diff --git a/scripts/restore_db_mysql.sh b/bin/db/restore_db_mysql.sh similarity index 100% rename from scripts/restore_db_mysql.sh rename to bin/db/restore_db_mysql.sh diff --git a/bin/graph_model.sh b/bin/graph_model.sh new file mode 100755 index 00000000..b5cda09e --- /dev/null +++ b/bin/graph_model.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker-compose run app python /srv/app/manage.py graph_models organization-core organization-media organization-pages organization.network organization.magazine organization.projects organization.agenda organization.shop organization.job > /srv/doc/graph/mezzanine-organization.dot diff --git a/install.py b/bin/install.py similarity index 100% rename from install.py rename to bin/install.py diff --git a/scripts/makemigrations.sh b/bin/makemigrations.sh similarity index 100% rename from scripts/makemigrations.sh rename to bin/makemigrations.sh diff --git a/scripts/migrate.sh b/bin/migrate.sh similarity index 100% rename from scripts/migrate.sh rename to bin/migrate.sh diff --git a/scripts/pf_osx.sh b/bin/pf_osx.sh similarity index 100% rename from scripts/pf_osx.sh rename to bin/pf_osx.sh diff --git a/scripts/pull.sh b/bin/pull.sh similarity index 100% rename from scripts/pull.sh rename to bin/pull.sh diff --git a/scripts/push.sh b/bin/push.sh similarity index 100% rename from scripts/push.sh rename to bin/push.sh diff --git a/scripts/fs_migrate.sh b/bin/tmp/fs_migrate.sh similarity index 55% rename from scripts/fs_migrate.sh rename to bin/tmp/fs_migrate.sh index 9dbfeab1..9ec9fcf1 100755 --- a/scripts/fs_migrate.sh +++ b/bin/tmp/fs_migrate.sh @@ -7,8 +7,3 @@ sudo mv var/postgresql var/lib sudo mv var/external var/opt sudo mv var/var/log var sudo rm -rf var/var -mkdir etc/nginx -mkdir etc/nginx/conf.d/ -mv etc/nginx.conf etc/nginx/conf.d/default.conf -mkdir etc/apt -mv etc/sources.list etc/apt/ diff --git a/scripts/upgrade.sh b/bin/upgrade.sh similarity index 100% rename from scripts/upgrade.sh rename to bin/upgrade.sh diff --git a/etc/sources.list b/etc/apt/sources.list similarity index 100% rename from etc/sources.list rename to etc/apt/sources.list diff --git a/etc/nginx/conf.d/default.conf b/etc/nginx/conf.d/default.conf new file mode 100644 index 00000000..decdcff4 --- /dev/null +++ b/etc/nginx/conf.d/default.conf @@ -0,0 +1,26 @@ +server_tokens off; + +server { + listen 80; + charset utf-8; + + access_log /var/log/nginx/app-access.log; + error_log /var/log/nginx/app-error.log; + + # max upload size + client_max_body_size 4096M; # adjust to taste + + # Django media + location /media { + alias /srv/media; # your Django project's media files - amend as required + } + # Django static + location /static { + alias /srv/static; # your Django project's static files - amend as required + } + + location / { + uwsgi_pass app:8000; + include /etc/nginx/uwsgi_params; + } +} -- 2.39.5