Model refactor (#280)

.gitignore

@@ -130,11 +130,8 @@ dmypy.json
 
 # --- USER-ADDED IGNORES --- #
 
-# The settings file.
-bcodb/settings.py
-
 # The server configuration file.
-server.conf
+.secrets
 
 # The migrations folder.
 # bco_api/api/migrations/
@@ -143,3 +140,4 @@ server.conf
 static/
 # JetBrains IDEs
 .idea/
+backups

.secrets.example

@@ -0,0 +1,15 @@
+[DJANGO_KEYS]
+SECRET_KEY=
+ANON_KEY=
+
+[SERVER]
+PRODUCTION=
+DEBUG=True
+ALLOWED_HOSTS=
+SERVER_VERSION=
+HOSTNAME=
+HUMAN_READABLE_HOSTNAME=
+PUBLIC_HOSTNAME=
+SERVER_URL=
+DATABASE=
+EMAIL_BACKEND=

admin_only/bco_api.conf

@@ -40,6 +40,25 @@ server {
         proxy_pass http://127.0.0.1:8080;
     }
 
+    # BCO API - Draft objects
+    #location ~* \/BCO_(\d+)\/(\d+)\.(\d+) {
+    location ~* ^/[a-zA-Z]+_DRAFT_(.*?) {
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://unix:/var/run/bco_api.sock;
+    }
+
+    # BCO API - Published objects
+    #location ~* \/BCO_(\d+)\/(\d+)\.(\d+) {
+    location ~* ^/[a-zA-Z]+_(.*?) {
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://unix:/var/run/bco_api.sock;
+    }
 
     location / {
         if ($request_method = 'OPTIONS') {
@@ -51,7 +70,7 @@ server {
         return 204;
         }
 
-        root /var/www/bcoeditor/portal/build/;
+        root root /var/www/bcoeditor/portal_userdb/client/build;
         try_files $uri /index.html;
         #try_files $uri $uri/ =404;
     }

admin_only/bco_api.service

@@ -1,10 +1,10 @@
 [Unit]
-Description=BCO Test API gunicorn daemon
+Description=BCODB API gunicorn daemon
 Requires=bco_api.socket
 After=network.target
 
 [Service]
 User=bco_api_user
 Group=nginx
-WorkingDirectory=/var/www/bcoeditor/bco_api/bco_api/
-ExecStart=/var/www/bcoeditor/bco_api/env/bin/gunicorn --access-logfile /var/log/gunicorn/api_stdout.log --log-level=debug --log-file /var/log/gunicorn/api_stderr.log --workers 3 --bind unix:/var/run/bco_api.sock bco_api.wsgi:application
+WorkingDirectory=/var/www/bcoeditor/bco_api/
+ExecStart=/var/www/bcoeditor/bco_api/env/bin/gunicorn --access-logfile /var/log/gunicorn/api_stdout.log --log-level=debug --log-file /var/log/gunicorn/api_stderr.log --workers 3 --bind unix:/var/run/bco_api.sock config.wsgi:application