From dfa74b70ec9f89d3ccf03b7b4ac41b03fb8c3e08 Mon Sep 17 00:00:00 2001 From: Christian Lempa Date: Mon, 10 Oct 2022 16:33:40 +0200 Subject: [PATCH 1/7] passbolt init --- docker-compose/passbolt/docker-compose.yml | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 docker-compose/passbolt/docker-compose.yml diff --git a/docker-compose/passbolt/docker-compose.yml b/docker-compose/passbolt/docker-compose.yml new file mode 100644 index 0000000..4911085 --- /dev/null +++ b/docker-compose/passbolt/docker-compose.yml @@ -0,0 +1,41 @@ +version: '3.9' +services: + db: + image: mariadb:10.3 + restart: unless-stopped + environment: + MYSQL_RANDOM_ROOT_PASSWORD: "true" + MYSQL_DATABASE: "passbolt" + MYSQL_USER: "passbolt" + MYSQL_PASSWORD: "P4ssb0lt" + volumes: + - database_volume:/var/lib/mysql + + passbolt: + image: passbolt/passbolt:latest-ce + #Alternatively you can use rootless: + #image: passbolt/passbolt:latest-ce-non-root + restart: unless-stopped + depends_on: + - db + environment: + APP_FULL_BASE_URL: https://passbolt.local + DATASOURCES_DEFAULT_HOST: "db" + DATASOURCES_DEFAULT_USERNAME: "passbolt" + DATASOURCES_DEFAULT_PASSWORD: "P4ssb0lt" + DATASOURCES_DEFAULT_DATABASE: "passbolt" + volumes: + - gpg_volume:/etc/passbolt/gpg + - jwt_volume:/etc/passbolt/jwt + command: ["/usr/bin/wait-for.sh", "-t", "0", "db:3306", "--", "/docker-entrypoint.sh"] + ports: + - 80:80 + - 443:443 + #Alternatively for non-root images: + # - 80:8080 + # - 443:4433 + +volumes: + database_volume: + gpg_volume: + jwt_volume: \ No newline at end of file From c8dc98707311c8e8d34e1b332602e208d6d7a5f6 Mon Sep 17 00:00:00 2001 From: Christian Lempa Date: Fri, 28 Oct 2022 16:37:23 +0200 Subject: [PATCH 2/7] mail server config changes --- docker-compose/passbolt/docker-compose.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/docker-compose/passbolt/docker-compose.yml b/docker-compose/passbolt/docker-compose.yml index 4911085..0f367fc 100644 --- a/docker-compose/passbolt/docker-compose.yml +++ b/docker-compose/passbolt/docker-compose.yml @@ -13,17 +13,26 @@ services: passbolt: image: passbolt/passbolt:latest-ce - #Alternatively you can use rootless: - #image: passbolt/passbolt:latest-ce-non-root + # Alternatively you can use rootless: + # image: passbolt/passbolt:latest-ce-non-root restart: unless-stopped depends_on: - db environment: + # Replace API_FULL_BASE_URL with your real FQDN APP_FULL_BASE_URL: https://passbolt.local DATASOURCES_DEFAULT_HOST: "db" DATASOURCES_DEFAULT_USERNAME: "passbolt" DATASOURCES_DEFAULT_PASSWORD: "P4ssb0lt" DATASOURCES_DEFAULT_DATABASE: "passbolt" + # Replace with your mail server config + # EMAIL_DEFAULT_FROM_NAME: "Passbolt" + # EMAIL_DEFAULT_FROM: "you@passbolt.local" + # EMAIL_TRANSPORT_DEFAULT_HOST: your-mail-server + # EMAIL_TRANSPORT_DEFAULT_PORT: 587 + # EMAIL_TRANSPORT_DEFAULT_USERNAME: your-mail-username + # EMAIL_TRANSPORT_DEFAULT_PASSWORD: your-mail-password + # EMAIL_TRANSPORT_DEFAULT_TLS: true volumes: - gpg_volume:/etc/passbolt/gpg - jwt_volume:/etc/passbolt/jwt @@ -31,7 +40,7 @@ services: ports: - 80:80 - 443:443 - #Alternatively for non-root images: + # Alternatively for non-root images: # - 80:8080 # - 443:4433 From 0401217d95e7257280444ddebac512c4bdc37dd6 Mon Sep 17 00:00:00 2001 From: Christian Lempa Date: Tue, 1 Nov 2022 07:11:01 +0100 Subject: [PATCH 3/7] cert-manager updates --- kubernetes/certmanager/templates/certificate.yaml | 12 ++++++++++++ .../certmanager/templates/clusterissuer-acme.yml | 6 +----- .../templates/clusterissuer-selfsigned.yml | 3 --- kubernetes/certmanager/templates/issuer-acme.yml | 3 +-- 4 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 kubernetes/certmanager/templates/certificate.yaml diff --git a/kubernetes/certmanager/templates/certificate.yaml b/kubernetes/certmanager/templates/certificate.yaml new file mode 100644 index 0000000..a48c792 --- /dev/null +++ b/kubernetes/certmanager/templates/certificate.yaml @@ -0,0 +1,12 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: your-certificate + namespace: your-namespace +spec: + secretName: your-secret + issuerRef: + name: ssl-issuer + kind: ClusterIssuer + dnsNames: + - your-hostname \ No newline at end of file diff --git a/kubernetes/certmanager/templates/clusterissuer-acme.yml b/kubernetes/certmanager/templates/clusterissuer-acme.yml index d731713..da57efb 100644 --- a/kubernetes/certmanager/templates/clusterissuer-acme.yml +++ b/kubernetes/certmanager/templates/clusterissuer-acme.yml @@ -2,9 +2,6 @@ apiVersion: cert-manager.io/v1 kind: ClusterIssuer metadata: name: acme-issuer - # (Optional) Metadata - # --- - # namespace: your-namespace spec: acme: # Configure your email here... @@ -42,9 +39,8 @@ spec: # (Optional) Add DNS selectors # --- # selector: - # dnsNames: + # dnsZones: # - 'your-domain' - # - '*.your-domain' # HTTP Challenge: # - http01: diff --git a/kubernetes/certmanager/templates/clusterissuer-selfsigned.yml b/kubernetes/certmanager/templates/clusterissuer-selfsigned.yml index a01e326..7820a9b 100644 --- a/kubernetes/certmanager/templates/clusterissuer-selfsigned.yml +++ b/kubernetes/certmanager/templates/clusterissuer-selfsigned.yml @@ -2,8 +2,5 @@ apiVersion: cert-manager.io/v1 kind: ClusterIssuer metadata: name: selfsigned-issuer - # (Optional) Metadata - # --- - # namespace: your-namespace spec: selfSigned: {} \ No newline at end of file diff --git a/kubernetes/certmanager/templates/issuer-acme.yml b/kubernetes/certmanager/templates/issuer-acme.yml index a36c969..359b5bb 100644 --- a/kubernetes/certmanager/templates/issuer-acme.yml +++ b/kubernetes/certmanager/templates/issuer-acme.yml @@ -42,9 +42,8 @@ spec: # (Optional) Add DNS selectors # --- # selector: - # dnsNames: + # dnsZones: # - 'your-domain' - # - '*.your-domain' # HTTP Challenge: # - http01: From 21e1b8e26bd708655814c6390ae1fa933a545e0b Mon Sep 17 00:00:00 2001 From: Christian Lempa Date: Mon, 7 Nov 2022 08:50:12 +0100 Subject: [PATCH 4/7] variable update --- docker-compose/passbolt/docker-compose.yml | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docker-compose/passbolt/docker-compose.yml b/docker-compose/passbolt/docker-compose.yml index 0f367fc..e158117 100644 --- a/docker-compose/passbolt/docker-compose.yml +++ b/docker-compose/passbolt/docker-compose.yml @@ -5,9 +5,9 @@ services: restart: unless-stopped environment: MYSQL_RANDOM_ROOT_PASSWORD: "true" - MYSQL_DATABASE: "passbolt" - MYSQL_USER: "passbolt" - MYSQL_PASSWORD: "P4ssb0lt" + MYSQL_DATABASE: $MYSQL_DATABASE + MYSQL_USER: $MYSQL_USER + MYSQL_PASSWORD: $MYSQL_PASSWORD volumes: - database_volume:/var/lib/mysql @@ -20,18 +20,18 @@ services: - db environment: # Replace API_FULL_BASE_URL with your real FQDN - APP_FULL_BASE_URL: https://passbolt.local - DATASOURCES_DEFAULT_HOST: "db" - DATASOURCES_DEFAULT_USERNAME: "passbolt" - DATASOURCES_DEFAULT_PASSWORD: "P4ssb0lt" - DATASOURCES_DEFAULT_DATABASE: "passbolt" + APP_FULL_BASE_URL: $APP_FULL_BASE_URL + DATASOURCES_DEFAULT_HOST: $DATASOURCES_DEFAULT_HOST + DATASOURCES_DEFAULT_USERNAME: $DATASOURCES_DEFAULT_USERNAME + DATASOURCES_DEFAULT_PASSWORD: $DATASOURCES_DEFAULT_PASSWORD + DATASOURCES_DEFAULT_DATABASE: $DATASOURCES_DEFAULT_DATABASE # Replace with your mail server config - # EMAIL_DEFAULT_FROM_NAME: "Passbolt" - # EMAIL_DEFAULT_FROM: "you@passbolt.local" - # EMAIL_TRANSPORT_DEFAULT_HOST: your-mail-server + # EMAIL_DEFAULT_FROM_NAME: $EMAIL_DEFAULT_FROM_NAME + # EMAIL_DEFAULT_FROM: $EMAIL_DEFAULT_FROM + # EMAIL_TRANSPORT_DEFAULT_HOST: $EMAIL_TRANSPORT_DEFAULT_HOST # EMAIL_TRANSPORT_DEFAULT_PORT: 587 - # EMAIL_TRANSPORT_DEFAULT_USERNAME: your-mail-username - # EMAIL_TRANSPORT_DEFAULT_PASSWORD: your-mail-password + # EMAIL_TRANSPORT_DEFAULT_USERNAME: $EMAIL_TRANSPORT_DEFAULT_USERNAME + # EMAIL_TRANSPORT_DEFAULT_PASSWORD: $EMAIL_TRANSPORT_DEFAULT_PASSWORD # EMAIL_TRANSPORT_DEFAULT_TLS: true volumes: - gpg_volume:/etc/passbolt/gpg From 3ed05d5935021bd23d9395e96d110e680d9d4469 Mon Sep 17 00:00:00 2001 From: Christian Lempa Date: Mon, 7 Nov 2022 08:53:08 +0100 Subject: [PATCH 5/7] boilerplates --- docker-compose/passbolt/docker-compose.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docker-compose/passbolt/docker-compose.yml b/docker-compose/passbolt/docker-compose.yml index e158117..f420c33 100644 --- a/docker-compose/passbolt/docker-compose.yml +++ b/docker-compose/passbolt/docker-compose.yml @@ -1,4 +1,10 @@ version: '3.9' + +volumes: + passbolt-db: + passbolt-gpg: + passbolt-jwt: + services: db: image: mariadb:10.3 @@ -9,7 +15,7 @@ services: MYSQL_USER: $MYSQL_USER MYSQL_PASSWORD: $MYSQL_PASSWORD volumes: - - database_volume:/var/lib/mysql + - passbolt-db:/var/lib/mysql passbolt: image: passbolt/passbolt:latest-ce @@ -34,17 +40,12 @@ services: # EMAIL_TRANSPORT_DEFAULT_PASSWORD: $EMAIL_TRANSPORT_DEFAULT_PASSWORD # EMAIL_TRANSPORT_DEFAULT_TLS: true volumes: - - gpg_volume:/etc/passbolt/gpg - - jwt_volume:/etc/passbolt/jwt + - passbolt-gpg:/etc/passbolt/gpg + - passbolt-jwt:/etc/passbolt/jwt command: ["/usr/bin/wait-for.sh", "-t", "0", "db:3306", "--", "/docker-entrypoint.sh"] ports: - 80:80 - 443:443 # Alternatively for non-root images: # - 80:8080 - # - 443:4433 - -volumes: - database_volume: - gpg_volume: - jwt_volume: \ No newline at end of file + # - 443:4433 \ No newline at end of file From 9994ad39faaa4e017a2cfae4b6c8f79889fd86af Mon Sep 17 00:00:00 2001 From: Christian Lempa Date: Tue, 29 Nov 2022 11:07:59 +0100 Subject: [PATCH 6/7] channel name update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a764cdf..0c5ffd2 100755 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This Repository **Boilerplates** is my personal template collection. Here you'll > :warning: Be aware, products can change over time. I do my best to keep up with the latest changes and releases, but please understand that this won’t always be the case. -I created them as free resources to be used in your specific use cases. If you're searching for detailed, in-depth tutorials on some tools or technologies, check out my YouTube Channel: [The Digital Life](https://www.youtube.com/channel/UCZNhwA1B5YqiY1nLzmM0ZRg). +I created them as free resources to be used in your specific use cases. If you're searching for detailed, in-depth tutorials on some tools or technologies, check out my YouTube Channel: [Christian Lempa](https://www.youtube.com/channel/UCZNhwA1B5YqiY1nLzmM0ZRg). ## Contribution From a0da58aa7c6f7198544ce3d2604ffc3f3adf1e01 Mon Sep 17 00:00:00 2001 From: Christian Lempa Date: Fri, 2 Dec 2022 09:47:53 +0100 Subject: [PATCH 7/7] passbolt update --- docker-compose/passbolt/docker-compose.yml | 57 +++++++++------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/docker-compose/passbolt/docker-compose.yml b/docker-compose/passbolt/docker-compose.yml index f420c33..22096bf 100644 --- a/docker-compose/passbolt/docker-compose.yml +++ b/docker-compose/passbolt/docker-compose.yml @@ -2,50 +2,41 @@ version: '3.9' volumes: passbolt-db: - passbolt-gpg: - passbolt-jwt: - + passbolt-data-gpg: + passbolt-data-jwt: + services: - db: + passbolt-db: + container_name: passbolt-db image: mariadb:10.3 restart: unless-stopped environment: - MYSQL_RANDOM_ROOT_PASSWORD: "true" - MYSQL_DATABASE: $MYSQL_DATABASE - MYSQL_USER: $MYSQL_USER - MYSQL_PASSWORD: $MYSQL_PASSWORD + - MYSQL_RANDOM_ROOT_PASSWORD=true + - MYSQL_DATABASE=$PASSBOLT_DB_NAME + - MYSQL_USER=$PASSBOLT_DB_USER + - MYSQL_PASSWORD=$PASSBOLT_DB_PASS volumes: - passbolt-db:/var/lib/mysql passbolt: + container_name: passbolt-app image: passbolt/passbolt:latest-ce - # Alternatively you can use rootless: - # image: passbolt/passbolt:latest-ce-non-root restart: unless-stopped depends_on: - - db + - passbolt-db environment: - # Replace API_FULL_BASE_URL with your real FQDN - APP_FULL_BASE_URL: $APP_FULL_BASE_URL - DATASOURCES_DEFAULT_HOST: $DATASOURCES_DEFAULT_HOST - DATASOURCES_DEFAULT_USERNAME: $DATASOURCES_DEFAULT_USERNAME - DATASOURCES_DEFAULT_PASSWORD: $DATASOURCES_DEFAULT_PASSWORD - DATASOURCES_DEFAULT_DATABASE: $DATASOURCES_DEFAULT_DATABASE - # Replace with your mail server config - # EMAIL_DEFAULT_FROM_NAME: $EMAIL_DEFAULT_FROM_NAME - # EMAIL_DEFAULT_FROM: $EMAIL_DEFAULT_FROM - # EMAIL_TRANSPORT_DEFAULT_HOST: $EMAIL_TRANSPORT_DEFAULT_HOST - # EMAIL_TRANSPORT_DEFAULT_PORT: 587 - # EMAIL_TRANSPORT_DEFAULT_USERNAME: $EMAIL_TRANSPORT_DEFAULT_USERNAME - # EMAIL_TRANSPORT_DEFAULT_PASSWORD: $EMAIL_TRANSPORT_DEFAULT_PASSWORD - # EMAIL_TRANSPORT_DEFAULT_TLS: true + - APP_FULL_BASE_URL=https://passbolt.domain.tld + - DATASOURCES_DEFAULT_HOST=passbolt-db + - DATASOURCES_DEFAULT_USERNAME=$PASSBOLT_DB_USER + - DATASOURCES_DEFAULT_PASSWORD=$PASSBOLT_DB_PASS + - DATASOURCES_DEFAULT_DATABASE=$PASSBOLT_DB_NAME + - EMAIL_TRANSPORT_DEFAULT_HOST=your-mail-server + - EMAIL_TRANSPORT_DEFAULT_PORT=587 + - EMAIL_TRANSPORT_DEFAULT_USERNAME=$EMAIL_TRANSPORT_DEFAULT_USERNAME + - EMAIL_TRANSPORT_DEFAULT_PASSWORD=$EMAIL_TRANSPORT_DEFAULT_PASSWORD + - EMAIL_TRANSPORT_DEFAULT_TLS=true + - EMAIL_DEFAULT_FROM=no-reply@domain.tld volumes: - - passbolt-gpg:/etc/passbolt/gpg - - passbolt-jwt:/etc/passbolt/jwt + - passbolt-data-gpg:/etc/passbolt/gpg + - passbolt-data-jwt:/etc/passbolt/jwt command: ["/usr/bin/wait-for.sh", "-t", "0", "db:3306", "--", "/docker-entrypoint.sh"] - ports: - - 80:80 - - 443:443 - # Alternatively for non-root images: - # - 80:8080 - # - 443:4433 \ No newline at end of file