From d183e43427e3f2b4851cbf0390c6132a28334d59 Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Fri, 12 Jan 2024 17:45:00 +0000 Subject: [PATCH] Removed secrets.yaml and finalised volumes --- deploy | 4 +-- networks.yaml | 3 +++ secrets.yaml | 9 ------- volumes.yaml | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 75 insertions(+), 12 deletions(-) delete mode 100644 secrets.yaml diff --git a/deploy b/deploy index e6f21c0..1f07ea6 100755 --- a/deploy +++ b/deploy @@ -81,9 +81,9 @@ def deploy_stack(username: str, password: str, stack_name: Optional[str] = "stac stacks = portainer.StacksApi(client) # Then, deploy the substacks using the 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("networks", stacks, endpoint_id) + # portainer_deploy_stack("volumes", stacks, endpoint_id) # portainer_deploy_stack("backend", stacks, endpoint_id) # portainer_deploy_stack("frontend", stacks, endpoint_id) print("Stack deployed!") diff --git a/networks.yaml b/networks.yaml index 5902448..b8c46c8 100644 --- a/networks.yaml +++ b/networks.yaml @@ -69,18 +69,21 @@ networks: volumes: networks_traefik: + name: stack_networks_traefik driver: local driver_opts: type: nfs device: ":volume1/traefik" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" networks_letsencrypt: + name: stack_networks_letsencrypt driver: local driver_opts: type: nfs device: ":volume1/letsencrypt" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" networks_coredns: + name: stack_networks_coredns driver: local driver_opts: type: nfs diff --git a/secrets.yaml b/secrets.yaml deleted file mode 100644 index 9d17489..0000000 --- a/secrets.yaml +++ /dev/null @@ -1,9 +0,0 @@ -version: "3.8" - -secrets: - elabftw_sql_key: - external: true - elabftw_secret_key: - external: true - dataverse_postgres_key: - external: true \ No newline at end of file diff --git a/volumes.yaml b/volumes.yaml index dd85e5b..480fce6 100644 --- a/volumes.yaml +++ b/volumes.yaml @@ -1,81 +1,137 @@ 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 requires nodes to be IP whitelisted in the NAS 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: + name: stack_traefik driver: local driver_opts: type: nfs device: ":volume1/traefik" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" letsencrypt: + name: stack_letsencrypt driver: local driver_opts: type: nfs device: ":volume1/letsencrypt" 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: + name: stack_web driver: local driver_opts: type: nfs device: ":volume1/web" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" grafana: + name: stack_grafana driver: local driver_opts: type: nfs device: ":volume1/grafana" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse: + name: stack_dataverse driver: local driver_opts: type: nfs device: ":volume1/dataverse" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse_db: + name: stack_dataverse_db driver: local driver_opts: type: nfs device: ":volume1/dataverse/postgres_db" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse_secrets: + name: stack_dataverse_secrets driver: local driver_opts: type: nfs device: ":volume1/dataverse/secrets" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse_solr_data: + name: stack_dataverse_solr_data driver: local driver_opts: type: nfs device: ":volume1/dataverse/solr-data" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse_triggers: + name: stack_dataverse_triggers driver: local driver_opts: type: nfs device: ":volume1/dataverse/triggers" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse_solr: + name: stack_dataverse_solr driver: local driver_opts: type: nfs device: ":volume1/dataverse/solr" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse_minio: + name: stack_dataverse_minio driver: local driver_opts: type: nfs device: ":volume1/dataverse/minio-data" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse_config: + name: stack_dataverse_config driver: local driver_opts: type: nfs device: ":volume1/dataverse/config" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse_schema: + name: stack_dataverse_schema driver: local driver_opts: type: nfs @@ -83,56 +139,69 @@ volumes: device: ":volume1/dataverse/config/schema.xml" # /opt/payara/appserver/glassfish/domains/domain1/config <- login config is here in container dataverse_init: + name: stack_dataverse_init driver: local driver_opts: type: nfs device: ":volume1/dataverse/init.d" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse_data: + name: stack_dataverse_data driver: local driver_opts: type: nfs device: ":volume1/dataverse/data" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" dataverse_docroot: + name: stack_dataverse_docroot driver: local driver_opts: type: nfs device: ":volume1/dataverse/docroot" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" neo4j: + name: stack_neo4j driver: local driver_opts: type: nfs device: ":volume1/neo4j" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" senaite: + name: stack_senaite driver: local driver_opts: type: nfs device: ":volume1/senaite" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" elabftw_uploads: + name: stack_elabftw_uploads driver: local driver_opts: type: nfs device: ":volume1/elabftw/uploads" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" elabftw_var: + name: stack_elabftw_var driver: local driver_opts: type: nfs device: ":volume1/elabftw/var" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" elabftw_etc: + name: stack_elabftw_etc driver: local driver_opts: type: nfs device: ":volume1/elabftw/etc" o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" elabftw_sql: + name: stack_elabftw_sql driver: local driver_opts: type: nfs device: ":volume1/elabftw/sql" - o: "addr=192.168.1.237,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4" \ No newline at end of file + 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 \ No newline at end of file