Merge branch 'test'

Author: dameyerdave

.env.TEMPLATE

@@ -7,4 +7,7 @@ DJANGO_SU_NAME=admin.name
 [email protected]
 DJANGO_SU_PASSWORD=admin.password
 
+REDIS_HOST=redis
+REDIS_PORT=6379
+
 SOCIBP_BASE_URL=https://xxx:[email protected]/

.github/ISSUE_TEMPLATE/bug-harvester-template.md

@@ -0,0 +1,30 @@
+---
+name: Harvester Bug Report
+about: You want to report a bug in the Harvester.
+title: "[TITLE]"
+labels: Bug, Harvester
+---
+
+### Summary
+
+<!-- Summarize the bug encountered concisely -->
+
+### Steps to reproduce
+
+<!-- How one can reproduce the issue - this is very important -->
+
+### Example page (Optional)
+
+<!-- If possible, please provide the URL of the page here that exhibits the problematic behavior -->
+
+### Current *bug* behavior
+
+<!-- What actually happens -->
+
+### Expected *correct* behavior
+
+<!-- What you should see instead -->
+
+### Relevant screenshots and/or logs
+
+<!-- Paste any relevant screenshots -->

.github/ISSUE_TEMPLATE/feature-harvester-template.md

@@ -0,0 +1,22 @@
+---
+name: Harvester Feature Report
+about: You want to report a bug in the Harvester.
+title: "[TITLE]"
+labels: Feature, Harvester
+---
+
+### Problem to solve
+
+<!-- What problem do we solve? -->
+
+### Further details
+
+<!-- Include use cases, benefits, and/or goals -->
+
+### Proposal
+
+<!-- What do you propose to solve this problem? -->
+
+### Links / references
+
+<!-- Provide any screenshot or links to websites that may be relevant to your proposal -->

.gitignore

@@ -9,6 +9,7 @@ __pycache__
 /svip_db_backups/**/*.sql
 TODO.md
 *.swp
+.DS_Store
 
 # stuff we don't want to commit quite yet
 /sensitive

compose_configs/prod.yml

@@ -13,6 +13,5 @@ services:
     volumes:
       - api_static:/app/static
     environment:
-      # - POSTGRES_DB=svip_api
       - USE_DEV_SERVER=
       - DJANGO_SETTINGS_MODULE=svip_server.settings.production

compose_configs/sites/sib-svip-private.yml

@@ -8,14 +8,18 @@ services:
         https_proxy: http://172.17.0.1:18184
   nginx:
     ports:
+      - "443:443"
       - "80:80"
     volumes:
-      - "${PWD}/service_config/nginx/sites/without_ssl.nginx:/etc/nginx/conf.d/svip.nginx:ro"
+      # - "${PWD}/service_config/nginx/sites/without_ssl.nginx:/etc/nginx/conf.d/svip.nginx:ro"
+      - "${PWD}/service_config/nginx/sites/with_ssl.nginx:/etc/nginx/conf.d/svip.nginx:ro"
+      - /var/vhosts/cert-store/vital-it.ch/fullchain.pem:/etc/pki/tls/certs/host.crt.pem
+      - /var/vhosts/cert-store/vital-it.ch/privkey.pem:/etc/pki/tls/private/host.privkey.pem
 
   frontend:
     build:
       args:
         http_proxy: http://172.17.0.1:18184
         https_proxy: http://172.17.0.1:18184
     environment:
-      - "VUE_APP_API_URL=https://svip.sensa.sib.swiss/api/v1/"
+      - "VUE_APP_API_URL=/api/v1/"

docker-compose.override.yml

@@ -29,3 +29,7 @@ services:
       - '3000:8080'
     environment:
       - 'VUE_APP_API_URL=http://localhost:8085/api/v1/'
+
+  redis:
+    ports:
+      - "${REDIS_PORT}:${REDIS_PORT}"

docker-compose.yml

@@ -35,19 +35,22 @@ services:
       - "svip_pgdata:/var/lib/postgresql/data"
       - ./svip_db_backups:/backups
       - ./service_config/postgres:/docker-entrypoint-initdb.d
-    environment:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-      - POSTGRES_DB
-      - PGUSER=${POSTGRES_USER}
-      - PGPASSWORD=${POSTGRES_PASSWORD}
-      - PGDB=${POSTGRES_DB}
+    # environment:
+    #   - POSTGRES_USER
+    #   - POSTGRES_PASSWORD
+    #   - POSTGRES_DB
+    #   - PGUSER=${POSTGRES_USER}
+    #   - PGPASSWORD=${POSTGRES_PASSWORD}
+    #   - PGDB=${POSTGRES_DB}
+    env_file:
+      - .env
 
   api:
     container_name: svip_api
     # image: "svip_api:latest"
     build: ./svip_api
     # restart: always
+    hostname: api
     volumes:
       - ./svip_api:/app
       - api_static:/var/staticfiles
@@ -56,17 +59,21 @@ services:
     depends_on:
       - db
       - redis
-    environment:
-      - POSTGRES_HOST=db
-      - POSTGRES_PORT=5432
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-      - POSTGRES_DB
-      - DJANGO_SU_NAME
-      - DJANGO_SU_EMAIL
-      - DJANGO_SU_PASSWORD
-      - SOCIBP_BASE_URL
-      - USE_DEV_SERVER=true
+    # environment:
+    #   - POSTGRES_HOST=db
+    #   - POSTGRES_PORT=5432
+    #   - POSTGRES_USER
+    #   - POSTGRES_PASSWORD
+    #   - POSTGRES_DB
+    #   - DJANGO_SU_NAME
+    #   - DJANGO_SU_EMAIL
+    #   - DJANGO_SU_PASSWORD
+    #   - SOCIBP_BASE_URL
+    #   - USE_DEV_SERVER=true
+    #   - REDIS_HOST=${REDIS_HOST}
+    #   - REDIS_PORT=${REDIS_PORT}
+    env_file:
+      - .env
 
   frontend:
     container_name: svip_frontend
@@ -85,11 +92,11 @@ services:
       - "3000:8080"
     environment:
       - "VUE_APP_API_URL=http://localhost:8085/api/v1/"
-    env_file:
-      - .env
     depends_on:
       - api
 
   redis:
     container_name: svip_redis
     image: "redis:alpine"
+    env_file:
+      - .env

svip-o-vue/.gitignore

@@ -12,3 +12,5 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
+
+.env*