From 70dbb0178177c0169e67dc1ddfb88a15550df85d Mon Sep 17 00:00:00 2001 From: Brooke Date: Sun, 23 Nov 2025 21:52:53 -0500 Subject: [PATCH 1/3] make relevant config changes to reflect requirements of privatebin 2.x --- conf.php.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.php.tmpl b/conf.php.tmpl index c912c7d..9a297ed 100644 --- a/conf.php.tmpl +++ b/conf.php.tmpl @@ -40,7 +40,7 @@ languagedefault = "en" email = {{ env "PB_EMAIL_ENABLE" }} -icon = "none" +icon = "jdenticon" {{ if eq (env "PB_THEME") "bootstrap5" }} cspheader = "default-src 'self'; base-uri 'self'; form-action 'none'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'wasm-unsafe-eval'; style-src 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads" @@ -178,4 +178,4 @@ dir = PATH "data" ; Subresource integrity (SRI) hashes used in template files. Uncomment and set ; these for all js files used. See: ; https://github.com/PrivateBin/PrivateBin/wiki/FAQ#user-content-how-to-make-privatebin-work-when-i-have-changed-some-javascript-files -;js/privatebin.js = "sha512-[…]" \ No newline at end of file +;js/privatebin.js = "sha512-[…]" -- 2.49.0 From e0ea5fb9a5d78c79ffdfa6c1ff26d07540389e41 Mon Sep 17 00:00:00 2001 From: Brooke Date: Sun, 23 Nov 2025 21:53:26 -0500 Subject: [PATCH 2/3] bump version to 2.0.3 --- compose.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compose.yml b/compose.yml index 338a84e..a3dd07f 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: privatebin/nginx-fpm-alpine:1.7.6 + image: privatebin/nginx-fpm-alpine:2.0.3 configs: - source: php_config target: /srv/cfg/conf.php @@ -23,11 +23,11 @@ services: - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "coop-cloud.${STACK_NAME}.version=0.6.0+1.7.6" + - "coop-cloud.${STACK_NAME}.version=1.0.0+2.0.3" volumes: - privatebin-data:/srv/data:rw healthcheck: - test: [ "CMD", "wget", "-qO/dev/null", "http://localhost:8080" ] + test: ["CMD", "wget", "-qO/dev/null", "http://localhost:8080"] interval: 30s retries: 3 start_period: 30s @@ -36,7 +36,6 @@ services: volumes: privatebin-data: - networks: proxy: external: true -- 2.49.0 From fc0c2ef36c5d7a853e2b16c294fcc6280f1cced2 Mon Sep 17 00:00:00 2001 From: Brooke Date: Sun, 23 Nov 2025 21:55:40 -0500 Subject: [PATCH 3/3] add tests, update readme --- .drone.yml | 23 ++++++++++++++++++++--- README.md | 22 +++++++++++----------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 47080d2..7d629cb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,7 @@ steps: image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest settings: host: swarm-test.autonomic.zone - stack: example_com # UPDATE ME + stack: privatebin generate_secrets: true purge: true deploy_key: @@ -14,9 +14,26 @@ steps: networks: - proxy environment: - DOMAIN: example.swarm-test.autonomic.zone # UPDATE ME - STACK_NAME: example_com # UPDATE ME + DOMAIN: privatebin.swarm-test.autonomic.zone + STACK_NAME: privatebin LETS_ENCRYPT_ENV: production + PB_INSTANCE_NAME: PrivateBin + PB_DISCUSSIONS_ENABLE: true + PB_DISCUSSIONS_TIMECODE_COMMENTS: false + PB_PASSWORD_ENABLE: true + PB_QRCODE_ENABLE: true + PB_FILE_UPLOAD_ENABLE: false + PB_THEME: bootstrap5 + PB_SYNTAX_HIGHLIGHTING_THEME: "sons-of-obsidian" + PB_INFO: "" + PB_NOTICE: "" + PB_FILE_UPLOAD_SIZE_LIMIT: 10485760 + PB_RATE_LIMITING: 10 + PB_BURN_AFTER_READING_PRESELECT: false + PB_DISCUSSIONS_PRESELECT: false + PB_DEFAULT_FORMATTER: plaintext + PB_EMAIL_ENABLE: true + PB_PUBLIC_DIRECTORY: false trigger: branch: - main diff --git a/README.md b/README.md index 71a670e..0b8004a 100644 --- a/README.md +++ b/README.md @@ -4,21 +4,21 @@ -* **Category**: Apps -* **Status**: wip -* **Image**: [`privatebin`](https://hub.docker.com/r/privatebin), 4, upstream -* **Healthcheck**: Yes -* **Backups**: No -* **Email**: N/A -* **Tests**: No -* **SSO**: N/A +- **Category**: Apps +- **Status**: 2 +- **Image**: [`privatebin`](https://hub.docker.com/r/privatebin), 4, upstream +- **Healthcheck**: Yes +- **Backups**: No +- **Email**: N/A +- **Tests**: Yes +- **SSO**: N/A ## Quick start -* `abra app new privatebin` -* `abra app config ` -* `abra app deploy ` +- `abra app new privatebin` +- `abra app config ` +- `abra app deploy ` For more, see [`PrivateBin wiki`](https://github.com/PrivateBin/PrivateBin/wiki). -- 2.49.0