diff --git a/.gitignore b/.gitignore index 8785993..94165cf 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ static/admin/ static/ckeditor/ static/debug_toolbar/ static/mptt/ -static/rest_framework/ \ No newline at end of file +static/rest_framework/ +cms/local_settings.py diff --git a/cms/local_settings.py b/cms/local_settings.py deleted file mode 100755 index 11567db..0000000 --- a/cms/local_settings.py +++ /dev/null @@ -1,32 +0,0 @@ -FRONTEND_HOST = 'http://localhost' -PORTAL_NAME = 'MediaCMS' -SECRET_KEY = 'ma!s3^b-cw!f#7s6s0m3*jx77a@riw(7701**(r=ww%w!2+yk2' -POSTGRES_HOST = 'db' -REDIS_LOCATION = "redis://redis:6379/1" - -DATABASES = { - "default": { - "ENGINE": "django.db.backends.postgresql", - "NAME": "mediacms", - "HOST": POSTGRES_HOST, - "PORT": "5432", - "USER": "mediacms", - "PASSWORD": "mediacms", - } -} - -CACHES = { - "default": { - "BACKEND": "django_redis.cache.RedisCache", - "LOCATION": REDIS_LOCATION, - "OPTIONS": { - "CLIENT_CLASS": "django_redis.client.DefaultClient", - }, - } -} - -# CELERY STUFF -BROKER_URL = REDIS_LOCATION -CELERY_RESULT_BACKEND = BROKER_URL - -DEBUG = False \ No newline at end of file diff --git a/deploy/docker/README.md b/deploy/docker/README.md index 0139f1f..7bf4eab 100644 --- a/deploy/docker/README.md +++ b/deploy/docker/README.md @@ -1,3 +1,3 @@ # MediaCMS on Docker -See: [Details](../../docs/Docker_deployment.md) \ No newline at end of file +See: [Details](../../docs/Docker_deployment.md) diff --git a/deploy/docker/entrypoint.sh b/deploy/docker/entrypoint.sh index dda8a3e..0f7c199 100755 --- a/deploy/docker/entrypoint.sh +++ b/deploy/docker/entrypoint.sh @@ -27,4 +27,4 @@ fi chmod +x /home/mediacms.io/mediacms/deploy/docker/start.sh /home/mediacms.io/mediacms/deploy/docker/prestart.sh -exec "$@" \ No newline at end of file +exec "$@" diff --git a/deploy/docker/local_settings.py b/deploy/docker/local_settings.py index 11567db..b03fbc2 100644 --- a/deploy/docker/local_settings.py +++ b/deploy/docker/local_settings.py @@ -29,4 +29,4 @@ CACHES = { BROKER_URL = REDIS_LOCATION CELERY_RESULT_BACKEND = BROKER_URL -DEBUG = False \ No newline at end of file +DEBUG = False diff --git a/deploy/docker/nginx_http_only.conf b/deploy/docker/nginx_http_only.conf index 91ce75a..47976c1 100644 --- a/deploy/docker/nginx_http_only.conf +++ b/deploy/docker/nginx_http_only.conf @@ -27,4 +27,4 @@ server { include /etc/nginx/sites-enabled/uwsgi_params; uwsgi_pass 127.0.0.1:9000; } -} \ No newline at end of file +} diff --git a/deploy/docker/reverse_proxy/client_max_body_size.conf b/deploy/docker/reverse_proxy/client_max_body_size.conf index e333433..baaa0b2 100644 --- a/deploy/docker/reverse_proxy/client_max_body_size.conf +++ b/deploy/docker/reverse_proxy/client_max_body_size.conf @@ -1 +1 @@ -client_max_body_size 1g; \ No newline at end of file +client_max_body_size 1g; diff --git a/deploy/docker/start.sh b/deploy/docker/start.sh index dbd11fe..c07707f 100755 --- a/deploy/docker/start.sh +++ b/deploy/docker/start.sh @@ -14,4 +14,4 @@ fi # Start Supervisor, with Nginx and uWSGI echo "Starting server using supervisord..." -exec /usr/bin/supervisord \ No newline at end of file +exec /usr/bin/supervisord diff --git a/deploy/docker/supervisord/supervisord-celery_beat.conf b/deploy/docker/supervisord/supervisord-celery_beat.conf index 9c8d76c..4500c96 100644 --- a/deploy/docker/supervisord/supervisord-celery_beat.conf +++ b/deploy/docker/supervisord/supervisord-celery_beat.conf @@ -9,4 +9,4 @@ user=www-data directory=/home/mediacms.io/mediacms priority=300 startinorder=true -command=/home/mediacms.io/bin/celery beat --pidfile=/home/mediacms.io/mediacms/pids/beat%%n.pid --loglevel=INFO --logfile=/home/mediacms.io/mediacms/logs/celery_beat.log \ No newline at end of file +command=/home/mediacms.io/bin/celery beat --pidfile=/home/mediacms.io/mediacms/pids/beat%%n.pid --loglevel=INFO --logfile=/home/mediacms.io/mediacms/logs/celery_beat.log diff --git a/deploy/docker/supervisord/supervisord-celery_long.conf b/deploy/docker/supervisord/supervisord-celery_long.conf index e5b1135..0798e9a 100644 --- a/deploy/docker/supervisord/supervisord-celery_long.conf +++ b/deploy/docker/supervisord/supervisord-celery_long.conf @@ -10,4 +10,4 @@ directory=/home/mediacms.io/mediacms priority=500 startinorder=true startsecs=0 -command=/home/mediacms.io/bin/celery multi start long1 --pidfile=/home/mediacms.io/mediacms/pids/%%n.pid --loglevel=INFO --logfile=/home/mediacms.io/mediacms/logs/celery_long.log -Ofair --prefetch-multiplier=1 -Q long_tasks \ No newline at end of file +command=/home/mediacms.io/bin/celery multi start long1 --pidfile=/home/mediacms.io/mediacms/pids/%%n.pid --loglevel=INFO --logfile=/home/mediacms.io/mediacms/logs/celery_long.log -Ofair --prefetch-multiplier=1 -Q long_tasks diff --git a/deploy/docker/supervisord/supervisord-celery_short.conf b/deploy/docker/supervisord/supervisord-celery_short.conf index 2373869..cb21525 100644 --- a/deploy/docker/supervisord/supervisord-celery_short.conf +++ b/deploy/docker/supervisord/supervisord-celery_short.conf @@ -9,4 +9,4 @@ user=www-data directory=/home/mediacms.io/mediacms priority=400 startinorder=true -command=/home/mediacms.io/bin/celery multi start short1 short2 --pidfile=/home/mediacms.io/mediacms/pids/%%n.pid --loglevel=INFO --logfile=/home/mediacms.io/mediacms/logs/celery_short.log --soft-time-limit=300 -c10 -Q short_tasks \ No newline at end of file +command=/home/mediacms.io/bin/celery multi start short1 short2 --pidfile=/home/mediacms.io/mediacms/pids/%%n.pid --loglevel=INFO --logfile=/home/mediacms.io/mediacms/logs/celery_short.log --soft-time-limit=300 -c10 -Q short_tasks diff --git a/deploy/docker/supervisord/supervisord-debian.conf b/deploy/docker/supervisord/supervisord-debian.conf index d92638b..54296b8 100644 --- a/deploy/docker/supervisord/supervisord-debian.conf +++ b/deploy/docker/supervisord/supervisord-debian.conf @@ -1,2 +1,2 @@ [supervisord] -nodaemon=true \ No newline at end of file +nodaemon=true diff --git a/deploy/docker/supervisord/supervisord-nginx.conf b/deploy/docker/supervisord/supervisord-nginx.conf index 22c921c..c785c19 100644 --- a/deploy/docker/supervisord/supervisord-nginx.conf +++ b/deploy/docker/supervisord/supervisord-nginx.conf @@ -8,4 +8,4 @@ priority=200 startinorder=true startsecs=0 # Graceful stop, see http://nginx.org/en/docs/control.html -stopsignal=QUIT \ No newline at end of file +stopsignal=QUIT diff --git a/deploy/docker/supervisord/supervisord-uwsgi.conf b/deploy/docker/supervisord/supervisord-uwsgi.conf index eb2414c..210f228 100644 --- a/deploy/docker/supervisord/supervisord-uwsgi.conf +++ b/deploy/docker/supervisord/supervisord-uwsgi.conf @@ -6,4 +6,4 @@ stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 priority=100 startinorder=true -startsecs=0 \ No newline at end of file +startsecs=0 diff --git a/deploy/docker/uwsgi.ini b/deploy/docker/uwsgi.ini index 2a98501..c36bc9f 100644 --- a/deploy/docker/uwsgi.ini +++ b/deploy/docker/uwsgi.ini @@ -21,4 +21,3 @@ vacuum = true hook-master-start = unix_signal:15 gracefully_kill_them_all need-app = true die-on-term = true -