Refactor repo structure

kartoza · Jul 3, 2024 · cd4846a · cd4846a
1 parent f91c927
commit cd4846a
Show file tree

Hide file tree

Showing 38 changed files with 22 additions and 334 deletions.
diff --git a/Dockerfile.g3wsuite-deps.dockerfile b/Dockerfile.g3wsuite-deps.dockerfile
diff --git a/Dockerfile.g3wsuite-deps.ltr.dockerfile b/Dockerfile.g3wsuite-deps.ltr.dockerfile
diff --git a/Dockerfile.g3wsuite-deps.ltr.mssql.dockerfile b/Dockerfile.g3wsuite-deps.ltr.mssql.dockerfile
diff --git a/Dockerfile.g3wsuite.dockerfile b/Dockerfile.g3wsuite.dockerfile
diff --git a/.env.example → deployment/.env.example b/.env.example → deployment/.env.example
diff --git a/docker-compose-consumer.yml → deployment/docker-compose-consumer.yml b/docker-compose-consumer.yml → deployment/docker-compose-consumer.yml
diff --git a/docker-compose-dev.yml → deployment/docker-compose-dev.yml b/docker-compose-dev.yml → deployment/docker-compose-dev.yml
@@ -67,12 +67,12 @@ services:
     volumes:
       - ${WEBGIS_DOCKER_SHARED_VOLUME}:/shared-volume
       - ${WEBGIS_DOCKER_SHARED_VOLUME}/node_modules:/code/node_modules
-      - ./config/g3w-suite/overrides/static:/code/static:ro
-      - ./config/g3w-suite/overrides/templates:/code/templates:ro
-      - ./config/g3w-suite/settings_docker.py:/code/g3w-admin/base/settings/local_settings.py
+      - ./docker/g3w-suite/overrides/static:/code/static:ro
+      - ./docker/g3w-suite/overrides/templates:/code/templates:ro
+      - ./docker/g3w-suite/settings_docker.py:/code/g3w-admin/base/settings/local_settings.py
       - ./scripts:/scripts
       - ${G3WSUITE_LOCAL_CODE_PATH}:/code
-      - ./config/qgis/QGIS3.ini:/shared-volume/QGIS/QGIS3.ini
+      - ./qgis/QGIS3.ini:/shared-volume/QGIS/QGIS3.ini
 
     entrypoint: /scripts/docker-entrypoint-dev.sh
 

diff --git a/docker-compose.yml → deployment/docker-compose.yml b/docker-compose.yml → deployment/docker-compose.yml
@@ -29,8 +29,8 @@ services:
 
   g3w-suite:
     build:
-      context: .
-      dockerfile: Dockerfile
+      context: ../
+      dockerfile: deployment/docker/Dockerfile
     environment:
       - DISPLAY=:99
       - G3WSUITE_TILECACHE_PATH
@@ -66,11 +66,11 @@ services:
     volumes:
       - ${WEBGIS_DOCKER_SHARED_VOLUME}:/shared-volume
       - ${WEBGIS_DOCKER_SHARED_VOLUME}/node_modules:/code/node_modules
-      - ./config/g3w-suite/overrides/static:/code/static:ro
-      - ./config/g3w-suite/overrides/templates:/code/templates:ro
-      - ./config/g3w-suite/settings_docker.py:/code/g3w-admin/base/settings/local_settings.py
+      - ./docker/g3w-suite/overrides/static:/code/static:ro
+      - ./docker/g3w-suite/overrides/templates:/code/templates:ro
+      - ./docker/g3w-suite/settings_docker.py:/code/g3w-admin/base/settings/local_settings.py
       - ./secrets/pg_service.conf:${PGSERVICEFILE}
-      - ./config/qgis/QGIS3.ini:/shared-volume/QGIS/QGIS3.ini
+      - ./qgis/QGIS3.ini:/shared-volume/QGIS/QGIS3.ini
 
     networks:
       internal:
@@ -94,9 +94,9 @@ services:
       - ${WEBGIS_DOCKER_SHARED_VOLUME}:/shared-volume
       - ${WEBGIS_DOCKER_SHARED_VOLUME}/var/www/.well-known:/var/www/.well-known
       - ${WEBGIS_DOCKER_SHARED_VOLUME}/certs/letsencrypt:/etc/letsencrypt:ro
-      - ./config/g3w-suite/overrides/static:/shared-volume/static/overrides:ro
-      - ./config/nginx:/etc/nginx/conf.d/:ro
-      - ./config/nginx/html:/var/www/html:ro
+      - ./docker/g3w-suite/overrides/static:/shared-volume/static/overrides:ro
+      - ./nginx:/etc/nginx/conf.d/:ro
+      - ./nginx/html:/var/www/html:ro
     logging:
       driver: "json-file"
       options:

diff --git a/Dockerfile → deployment/docker/Dockerfile b/Dockerfile → deployment/docker/Dockerfile
@@ -26,16 +26,16 @@ RUN apt update &&  \
 ARG G3W_SUITE_BRANCH
 
 # Override settings
-ADD requirements_rl.txt /requirements_rl.txt
+ADD deployment/docker/requirements_rl.txt /requirements_rl.txt
 
-ADD scripts /scripts
+ADD deployment/scripts /scripts
 
 RUN chmod +x /scripts/*.sh
 
 RUN /scripts/setup.sh \
     && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-ADD config/g3w-suite/overrides /code
+ADD deployment/docker/g3w-suite/overrides /code
 RUN cp /code/settings_docker.py /code/g3w-admin/base/settings/local_settings.py
 
 CMD echo "Base image for g3w-suite-dev" && tail -f /dev/null

diff --git a/...e/overrides/static/frontend/css/style.css → ...e/overrides/static/frontend/css/style.css b/...e/overrides/static/frontend/css/style.css → ...e/overrides/static/frontend/css/style.css
diff --git a/.../home/serey-morm-Z9G2Cm3n080-unsplash.jpg → .../home/serey-morm-Z9G2Cm3n080-unsplash.jpg b/.../home/serey-morm-Z9G2Cm3n080-unsplash.jpg → .../home/serey-morm-Z9G2Cm3n080-unsplash.jpg
diff --git a/...ides/templates/frontend/include/home.html → ...ides/templates/frontend/include/home.html b/...ides/templates/frontend/include/home.html → ...ides/templates/frontend/include/home.html
diff --git a/...s/templates/frontend/include/sidebar.html → ...s/templates/frontend/include/sidebar.html b/...s/templates/frontend/include/sidebar.html → ...s/templates/frontend/include/sidebar.html
diff --git a/...e/overrides/templates/frontend/index.html → ...e/overrides/templates/frontend/index.html b/...e/overrides/templates/frontend/index.html → ...e/overrides/templates/frontend/index.html
diff --git a/config/g3w-suite/settings_docker.py → ...yment/docker/g3w-suite/settings_docker.py b/config/g3w-suite/settings_docker.py → ...yment/docker/g3w-suite/settings_docker.py
@@ -25,7 +25,8 @@
     #'openrouteservice',
     'qtimeseries',
     'frontend',
-    'qps_timeseries'
+    'qps_timeseries',
+    'dam_monitor'
 ]
 
 DATABASES = {
@@ -211,4 +212,4 @@
 SESSION_COOKIE_NAME = 'gis3w-suite-dev-iehtgdb264t5gr'
 
 FRONTEND = True
-FRONTEND_APP = 'frontend'
+FRONTEND_APP = 'frontend'
diff --git a/requirements_rl.txt → deployment/docker/requirements_rl.txt b/requirements_rl.txt → deployment/docker/requirements_rl.txt
diff --git a/config/nginx/django → deployment/nginx/django b/config/nginx/django → deployment/nginx/django
diff --git a/config/nginx/django_ssl → deployment/nginx/django_ssl b/config/nginx/django_ssl → deployment/nginx/django_ssl
diff --git a/config/nginx/error_pages → deployment/nginx/error_pages b/config/nginx/error_pages → deployment/nginx/error_pages
diff --git a/config/nginx/html/502.html → deployment/nginx/html/502.html b/config/nginx/html/502.html → deployment/nginx/html/502.html
diff --git a/config/nginx/letsencrypt → deployment/nginx/letsencrypt b/config/nginx/letsencrypt → deployment/nginx/letsencrypt
diff --git a/config/nginx/locations → deployment/nginx/locations b/config/nginx/locations → deployment/nginx/locations
diff --git a/config/nginx/nginx.conf → deployment/nginx/nginx.conf b/config/nginx/nginx.conf → deployment/nginx/nginx.conf
diff --git a/config/qgis/QGIS3.ini → deployment/qgis/QGIS3.ini b/config/qgis/QGIS3.ini → deployment/qgis/QGIS3.ini
diff --git a/run_certbot.sh → deployment/run_certbot.sh b/run_certbot.sh → deployment/run_certbot.sh
diff --git a/scripts/debugger/README.md → deployment/scripts/debugger/README.md b/scripts/debugger/README.md → deployment/scripts/debugger/README.md
diff --git a/scripts/debugger/gunicorn_debugger.py → ...ent/scripts/debugger/gunicorn_debugger.py b/scripts/debugger/gunicorn_debugger.py → ...ent/scripts/debugger/gunicorn_debugger.py
diff --git a/scripts/docker-consumer-entrypoint.sh → ...ent/scripts/docker-consumer-entrypoint.sh b/scripts/docker-consumer-entrypoint.sh → ...ent/scripts/docker-consumer-entrypoint.sh
diff --git a/scripts/docker-entrypoint-dev.sh → deployment/scripts/docker-entrypoint-dev.sh b/scripts/docker-entrypoint-dev.sh → deployment/scripts/docker-entrypoint-dev.sh
diff --git a/scripts/docker-entrypoint.sh → deployment/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh → deployment/scripts/docker-entrypoint.sh
diff --git a/scripts/setup.sh → deployment/scripts/setup.sh b/scripts/setup.sh → deployment/scripts/setup.sh
@@ -17,6 +17,9 @@ pip3 install -r requirements_huey.txt
 #TODO make this as generic so that we can install as many plugins as possible
 git submodule add -f https://github.com/g3w-suite/g3w-admin-frontend.git  g3w-admin/frontend
 
+# Dam monitor
+git submodule add -f https://github.com/zamuzakki/dam-monitor.git  g3w-admin/dam_monitor
+
 
 # Caching
 pip3 install -r /code/g3w-admin/caching/requirements.txt

diff --git a/secrets/password → deployment/secrets/password b/secrets/password → deployment/secrets/password
diff --git a/secrets/pg_service.conf → deployment/secrets/pg_service.conf b/secrets/pg_service.conf → deployment/secrets/pg_service.conf
diff --git a/secrets/qgis-auth.db → deployment/secrets/qgis-auth.db b/secrets/qgis-auth.db → deployment/secrets/qgis-auth.db
diff --git a/docker/Dockerfile.qgis-server-oracle.dockerfile b/docker/Dockerfile.qgis-server-oracle.dockerfile
diff --git a/docker/qgis-server-oracle-build.sh b/docker/qgis-server-oracle-build.sh