Removed secrets.yaml and finalised volumes

This commit is contained in:
Cian Hughes
2024-01-12 17:45:00 +00:00
parent a0f01dde1a
commit d183e43427
4 changed files with 75 additions and 12 deletions

4
deploy
View File

@@ -81,9 +81,9 @@ def deploy_stack(username: str, password: str, stack_name: Optional[str] = "stac
stacks = portainer.StacksApi(client) stacks = portainer.StacksApi(client)
# Then, deploy the substacks using the API # Then, deploy the substacks using the API
print("Deploying substacks via portainer API") print("Deploying substacks via portainer API")
portainer_deploy_stack("volumes", stacks, endpoint_id)
# portainer_deploy_stack("networks", stacks, endpoint_id)
# portainer_deploy_stack("secrets", stacks, endpoint_id) # portainer_deploy_stack("secrets", stacks, endpoint_id)
portainer_deploy_stack("networks", stacks, endpoint_id)
# portainer_deploy_stack("volumes", stacks, endpoint_id)
# portainer_deploy_stack("backend", stacks, endpoint_id) # portainer_deploy_stack("backend", stacks, endpoint_id)
# portainer_deploy_stack("frontend", stacks, endpoint_id) # portainer_deploy_stack("frontend", stacks, endpoint_id)
print("Stack deployed!") print("Stack deployed!")

View File

@@ -69,18 +69,21 @@ networks:
volumes: volumes:
networks_traefik: networks_traefik:
name: stack_networks_traefik
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/traefik" device: ":volume1/traefik"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
networks_letsencrypt: networks_letsencrypt:
name: stack_networks_letsencrypt
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/letsencrypt" device: ":volume1/letsencrypt"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
networks_coredns: networks_coredns:
name: stack_networks_coredns
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs

View File

@@ -1,9 +0,0 @@
version: "3.8"
secrets:
elabftw_sql_key:
external: true
elabftw_secret_key:
external: true
dataverse_postgres_key:
external: true

View File

@@ -1,81 +1,137 @@
version: "3.8" version: "3.8"
services:
rsync:
image: alpineline/rsyncd:latest
deploy:
replicas: 1
restart_policy:
condition: on-failure
volumes:
- rsync_run:/var/run
- rsync_log:/var/log
- rsync_etc:/etc
networks:
i-form_research_server_stack:
ipv4_address: "172.252.0.4"
# This defines the NFS volumes for persistence # This defines the NFS volumes for persistence
#! This requires nodes to be IP whitelisted in the NAS #! This requires nodes to be IP whitelisted in the NAS
volumes: volumes:
rsync_run:
name: stack_rsync_run
driver: local
driver_opts:
type: nfs
device: ":volume1/rsync/run"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
rsync_log:
name: stack_rsync_log
driver: local
driver_opts:
type: nfs
device: ":volume1/rsync/log"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
rsync_etc:
name: stack_rsync_etc
driver: local
driver_opts:
type: nfs
device: ":volume1/rsync/etc"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
traefik: traefik:
name: stack_traefik
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/traefik" device: ":volume1/traefik"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
letsencrypt: letsencrypt:
name: stack_letsencrypt
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/letsencrypt" device: ":volume1/letsencrypt"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
coredns:
name: stack_coredns
driver: local
driver_opts:
type: nfs
device: ":volume1/coredns"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
web: web:
name: stack_web
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/web" device: ":volume1/web"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
grafana: grafana:
name: stack_grafana
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/grafana" device: ":volume1/grafana"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse: dataverse:
name: stack_dataverse
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse" device: ":volume1/dataverse"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse_db: dataverse_db:
name: stack_dataverse_db
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse/postgres_db" device: ":volume1/dataverse/postgres_db"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse_secrets: dataverse_secrets:
name: stack_dataverse_secrets
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse/secrets" device: ":volume1/dataverse/secrets"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse_solr_data: dataverse_solr_data:
name: stack_dataverse_solr_data
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse/solr-data" device: ":volume1/dataverse/solr-data"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse_triggers: dataverse_triggers:
name: stack_dataverse_triggers
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse/triggers" device: ":volume1/dataverse/triggers"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse_solr: dataverse_solr:
name: stack_dataverse_solr
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse/solr" device: ":volume1/dataverse/solr"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse_minio: dataverse_minio:
name: stack_dataverse_minio
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse/minio-data" device: ":volume1/dataverse/minio-data"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse_config: dataverse_config:
name: stack_dataverse_config
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse/config" device: ":volume1/dataverse/config"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse_schema: dataverse_schema:
name: stack_dataverse_schema
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
@@ -83,56 +139,69 @@ volumes:
device: ":volume1/dataverse/config/schema.xml" device: ":volume1/dataverse/config/schema.xml"
# /opt/payara/appserver/glassfish/domains/domain1/config <- login config is here in container # /opt/payara/appserver/glassfish/domains/domain1/config <- login config is here in container
dataverse_init: dataverse_init:
name: stack_dataverse_init
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse/init.d" device: ":volume1/dataverse/init.d"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse_data: dataverse_data:
name: stack_dataverse_data
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse/data" device: ":volume1/dataverse/data"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
dataverse_docroot: dataverse_docroot:
name: stack_dataverse_docroot
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/dataverse/docroot" device: ":volume1/dataverse/docroot"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
neo4j: neo4j:
name: stack_neo4j
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/neo4j" device: ":volume1/neo4j"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
senaite: senaite:
name: stack_senaite
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/senaite" device: ":volume1/senaite"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
elabftw_uploads: elabftw_uploads:
name: stack_elabftw_uploads
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/elabftw/uploads" device: ":volume1/elabftw/uploads"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
elabftw_var: elabftw_var:
name: stack_elabftw_var
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/elabftw/var" device: ":volume1/elabftw/var"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
elabftw_etc: elabftw_etc:
name: stack_elabftw_etc
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/elabftw/etc" device: ":volume1/elabftw/etc"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
elabftw_sql: elabftw_sql:
name: stack_elabftw_sql
driver: local driver: local
driver_opts: driver_opts:
type: nfs type: nfs
device: ":volume1/elabftw/sql" device: ":volume1/elabftw/sql"
o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
networks:
i-form_research_server_stack:
external: true