Cleanup

docker/django/production.py.sample

@@ -6,7 +6,7 @@ from freedcs import settings
 SECRET_KEY = 'i4z%50+4b4ek(l0#!w2-r1hpo%&r6tk7p$p_-(=6d!c9n=g5m&'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
 ALLOWED_HOSTS = ['*']
 
@@ -21,9 +21,10 @@ DATABASES = {
     }
 }
 
-MQTT_BROKER = {
+REST_FRAMEWORK = {
-    'HOST': 'rabbitmq',
+    'DEFAULT_RENDERER_CLASSES': (
-    'PORT': 1883,
+        'rest_framework.renderers.JSONRenderer',
+    )
 }
 
 SKIP_WHITELIST = True

docker/docker-compose.edge.yml

@@ -1,12 +1,13 @@
 version: "3.7"
 
-edge-host:
+services:
-  <<: *service_default
+  edge-host:
-  image: docker:dind
+    <<: *service_default
-  privileged: true
+    image: docker:dind
-  environment:
+    privileged: true
-    DOCKER_TLS_CERTDIR:
+    environment:
-  # networks:
+      DOCKER_TLS_CERTDIR:
-  #   - net
+    # networks:
-  ports:
+    #   - net
-    - "127.0.0.1:22375:2375"
+    ports:
+      - "127.0.0.1:22375:2375"

docker/docker-compose.prod.yml

@@ -8,13 +8,13 @@ services:
 
   freedcs:
     volumes:
-      - "./django/production.py.sample:/srv/freedcs/freedcs/production.py"
+      - "./django/production.py.sample:/srv/app/freedcs/freedcs/production.py"
     command: ["gunicorn", "-b", "0.0.0.0:8000", "freedcs.wsgi:application"]
 
   data-migration:
     volumes:
-      - "./django/production.py.sample:/srv/freedcs/freedcs/production.py"
+      - "./django/production.py.sample:/srv/app/freedcs/freedcs/production.py"
 
   mqtt-to-db:
     volumes:
-      - "./django/production.py.sample:/srv/freedcs/freedcs/production.py"
+      - "./django/production.py.sample:/srv/app/freedcs/freedcs/production.py"

docker/docker-compose.yml

@@ -32,22 +32,16 @@ services:
     networks:
       - net
 
-  rabbitmq:
+  broker:
     <<: *service_default
-    image: rabbitmq:3-management-alpine
+    image: eclipse-mosquitto
-    # environment:  # we use unauth access atm
-    #   RABBITMQ_DEFAULT_VHOST: "freedcs"
-    #   RABBITMQ_DEFAULT_USER: "freedcs"
-    #   RABBITMQ_DEFAULT_PASS: "password"
-    volumes:
-      - ./rabbitmq/enabled_plugins:/etc/rabbitmq/enabled_plugins
     networks:
       - net
     ports:
       - "1883:1883"
-      - "15672:15672"
 
   ingress:
+    <<: *service_default
     image: traefik:v2.2
     command: --api.insecure=true --providers.docker
     ports:
@@ -66,7 +60,7 @@ services:
       dockerfile: ./docker/django/Dockerfile
     image: daniviga/freedcs
     volumes:
-      - "../freedcs:/srv/freedcs"
+      - "../freedcs:/srv/app/freedcs"
     command: ["python3", "manage.py", "runserver", "0.0.0.0:8000"]
     networks:
       - net
@@ -80,7 +74,7 @@ services:
   data-migration:
     image: daniviga/freedcs
     volumes:
-      - "../freedcs:/srv/freedcs"
+      - "../freedcs:/srv/app/freedcs"
     command: ["python3", "manage.py", "migrate", "--noinput"]
     networks:
       - net
@@ -89,11 +83,11 @@ services:
     <<: *service_default
     image: daniviga/freedcs
     volumes:
-      - "../freedcs:/srv/freedcs"
+      - "../freedcs:/srv/app/freedcs"
     command: ["python3", "manage.py", "mqtt-to-db"]
     networks:
       - net
     depends_on:
       - data-migration
       - timescale
-      - rabbitmq
+      - broker

docker/mqtt/docker-compose.rabbitmq.yml

@@ -0,0 +1,18 @@
+version: "3.7"
+
+services:
+  broker:
+    image: rabbitmq:3-management-alpine
+    # environment:  # we use unauth access atm
+    #   RABBITMQ_DEFAULT_VHOST: "freedcs"
+    #   RABBITMQ_DEFAULT_USER: "freedcs"
+    #   RABBITMQ_DEFAULT_PASS: "password"
+    volumes:
+      - ./mqtt/rabbitmq/enabled_plugins:/etc/rabbitmq/enabled_plugins
+    networks:
+      - net
+    ports:
+      - "1883:1883"
+      - "15672:15672"
+    init: true
+    restart: always

docker/mqtt/docker-compose.vernemq.yml

@@ -0,0 +1,14 @@
+version: "3.7"
+
+services:
+  broker:
+    image: vernemq/vernemq
+    environment:
+      DOCKER_VERNEMQ_ALLOW_ANONYMOUS: "on"
+      DOCKER_VERNEMQ_ACCEPT_EULA: "yes"
+    networks:
+      - net
+    ports:
+      - "1883:1883"
+    init: true
+    restart: always

freedcs/freedcs/production.py.sample

@@ -1,27 +0,0 @@
-from freedcs import settings
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'i4z%50+4b4ek(l0#!w2-r1hpo%&r6tk7p$p_-(=6d!c9n=g5m&'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = ['*']
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'freedcs',
-        'USER': 'freedcs',
-        'PASSWORD': 'password',
-        'HOST': 'timescale',
-        'PORT': '5432',
-    }
-}
-
-MQTT_BROKER = {
-    'HOST': 'rabbitmq',
-    'PORT': '1883',
-}
-
-SKIP_WHITELIST = True

freedcs/freedcs/settings.py

@@ -129,7 +129,7 @@ STATIC_URL = '/static/'
 SKIP_WHITELIST = True
 
 MQTT_BROKER = {
-    'HOST': 'rabbitmq',
+    'HOST': 'broker',
     'PORT': '1883',
 }
 

freedcs/telemetry/views.py

@@ -42,8 +42,8 @@ class TelemetryLatest(ModelViewSet):
 
     def retrieve(self, request, device=None):
         queryset = Telemetry.objects.filter(
-            device__serial=device).order_by('-time')[0]
+            device__serial=device).order_by('-time')
         if not queryset:
             raise Http404
-        serializer = TelemetrySerializer(queryset)
+        serializer = TelemetrySerializer(queryset[0])
         return Response(serializer.data)