Update processing

Dockerfile

@@ -41,8 +41,6 @@ RUN chown -R user:user /app
 RUN chmod -R 755 /var/log/django
 RUN chown -R user:user /var/log/django
 
-RUN chown -R user:user /app/transmission/processing/temp
-RUN chmod -R 755 /app/transmission/processing/temp
 RUN chown -R user:user /app/home/temp
 RUN chmod -R 755 /app/home/temp
 

README.md

@@ -29,22 +29,25 @@ The dependencies are generated by running `./create_python_requirements`. This a
 3. Install the requirements (one time instruction):
 `pip install -r requirements.txt -r requirements_dev.txt`
 
-4. Set up the database via docker or connect your own Postgres instance
+4. Set up the database via docker
 `docker compose up db`
 
 5. Run the migrations from the root folder:
 `python src/manage.py migrate`
 
-6. Create the InfluxDB buckets:
+6. Set up InfluxDB via docker 
+`docker compose up influxdb`
+
+7. Create the InfluxDB buckets:
 `python src/manage.py initbuckets`
 
-7. Run the server from the root folder:
+8. Run the server from the root folder:
 `python src/manage.py runserver` The server runs on http://127.0.0.1:8000/
 
-8. To run the tests:
+9. To run the tests:
 `python src/manage.py test`
 
-9. To run pylint:
+10. To run pylint:
 `find src -name "*.py" | xargs pylint`
 
 ## Setup (Run via docker)
@@ -115,7 +118,7 @@ CROWDSEC_LAPI=
 
 8. Generate a django keys with `python manage.py djecrety` and copy it to the .env file.
 
-9. Create the InfluxDB buckets: `python src/manage.py initbuckets`
+9. Create the InfluxDB buckets: `python manage.py initbuckets`
 
 Note: remove `--build` to skip building the container, will use the cached one (last build)
 

docker-compose-deploy.yml

@@ -22,7 +22,7 @@ services:
             driver: "json-file"
             options:
                 max-file: "5"   # file count
-                max-size: "10m" # file size
+                max-size: "1m"  # file size
 
 
     proxy:
@@ -51,7 +51,11 @@ services:
 
     pgadmin:
         container_name: pgadmin4_container
+<<<<<<< HEAD
+        image: dpage/pgadmin4:8.6
+=======
         image: dpage/pgadmin4:8.9
+>>>>>>> 4c892495399d42d7e674640b738a495bfe09dc8b
         restart: always
         environment:
             - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL:[email protected]}
@@ -68,7 +72,7 @@ services:
 
 
     crowdsec:
-        image: crowdsecurity/crowdsec:v1.6.0-1
+        image: crowdsecurity/crowdsec:v1.6.2
         restart: always
         ports:
             - "8080:8080"

docker-compose.yml

@@ -23,7 +23,6 @@ services:
     build:
         context: .
     volumes:
-      - ./src/transmission/processing/temp/:/app/transmission/processing/temp/
       - ./src/home/temp/:/app/home/temp/
     environment:
         - ALLOWED_HOSTS=${ALLOWED_HOSTS:-localhost,127.0.0.1}
@@ -32,7 +31,6 @@ services:
         - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
         - POSTGRES_HOST=${POSTGRES_HOST:-db}
         - POSTGRES_PORT=${POSTGRES_PORT:-5432}
-        - INFLUXDB_V2_ORG=${INFLUXDB_V2_ORG:-DelfiSpace}
         - INFLUXDB_V2_TOKEN=${INFLUXDB_V2_TOKEN:-adminpwd}
     restart: always
     depends_on:
@@ -56,8 +54,8 @@ services:
       - DOCKER_INFLUXDB_INIT_MODE=setup
       - DOCKER_INFLUXDB_INIT_USERNAME=${INFLUX_USERNAME:-admin}
       - DOCKER_INFLUXDB_INIT_PASSWORD=${INFLUX_PASSWORD:-adminpwd}
-      - DOCKER_INFLUXDB_INIT_ORG=${INFLUXDB_V2_ORG:-DelfiSpace}
-      - DOCKER_INFLUXDB_INIT_BUCKET=${INFLUX_BUCKET:-default}
+      - DOCKER_INFLUXDB_INIT_ORG=default
+      - DOCKER_INFLUXDB_INIT_BUCKET=default
       - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=${INFLUXDB_V2_TOKEN:-adminpwd}
     restart: always
     logging:
@@ -80,6 +78,7 @@ services:
     environment:
       - GF_SERVER_DOMAIN=${GF_SERVER_DOMAIN:-localhost}
       - GF_INFLUXDB_V2_TOKEN=${INFLUXDB_V2_TOKEN:-adminpwd}
+      - INFLUXDB_V2_ORG=${INFLUXDB_V2_ORG:-DelfiSpace}
     restart: always
     logging:
       driver: "json-file"

docs/deployment_intructions.md

@@ -32,22 +32,25 @@ The dependencies are generated by running `./create_python_requirements`. This a
 3. Install the requirements (one time instruction):
 `pip install -r requirements.txt -r requirements_dev.txt`
 
-4. Set up the database via docker or connect your own Postgres instance
+4. Set up the database via docker
 `docker compose up db`
 
 5. Run the migrations from the root folder:
 `python src/manage.py migrate`
 
-6. Create the InfluxDB buckets:
+6. Set up InfluxDB via docker
+`docker compose up influxdb`
+
+7. Create the InfluxDB buckets:
 `python src/manage.py initbuckets`
 
-7. Run the server from the root folder:
+8. Run the server from the root folder:
 `python src/manage.py runserver` The server runs on http://127.0.0.1:8000/
 
-8. To run the tests:
+9. To run the tests:
 `python src/manage.py test`
 
-9. To run pylint:
+10. To run pylint:
 `find src -name "*.py" | xargs pylint`
 
 ## Setup (Run via docker)
@@ -118,7 +121,7 @@ CROWDSEC_LAPI=
 
 8. Generate a django keys with `python manage.py djecrety` and copy it to the .env file.
 
-9. Create the InfluxDB buckets: `python src/manage.py initbuckets`
+9. Create the InfluxDB buckets: `python manage.py initbuckets`
 
 Note: remove `--build` to skip building the container, will use the cached one (last build)