fix local_install

.gitignore

@@ -8,4 +8,5 @@ static/admin/
 static/ckeditor/
 static/debug_toolbar/
 static/mptt/
-static/rest_framework/
+static/rest_framework/
+cms/local_settings.py

cms/local_settings.py

@@ -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

deploy/docker/README.md

@@ -1,3 +1,3 @@
 # MediaCMS on Docker
 
-See: [Details](../../docs/Docker_deployment.md)
+See: [Details](../../docs/Docker_deployment.md)

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 "$@"
+exec "$@"

deploy/docker/local_settings.py

@@ -29,4 +29,4 @@ CACHES = {
 BROKER_URL = REDIS_LOCATION
 CELERY_RESULT_BACKEND = BROKER_URL
 
-DEBUG = False
+DEBUG = False

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;
     }
-}
+}

deploy/docker/reverse_proxy/client_max_body_size.conf

@@ -1 +1 @@
-client_max_body_size 1g;
+client_max_body_size 1g;

deploy/docker/start.sh

@@ -14,4 +14,4 @@ fi
 # Start Supervisor, with Nginx and uWSGI
 echo "Starting server using supervisord..."
 
-exec /usr/bin/supervisord
+exec /usr/bin/supervisord

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
+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

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
+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

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
+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

deploy/docker/supervisord/supervisord-debian.conf

@@ -1,2 +1,2 @@
 [supervisord]
-nodaemon=true
+nodaemon=true

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
+stopsignal=QUIT

deploy/docker/supervisord/supervisord-uwsgi.conf

@@ -6,4 +6,4 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 priority=100
 startinorder=true
-startsecs=0
+startsecs=0

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
-