From 9231727e38a2d840a7eefd46facf868623d8f939 Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Sun, 27 Oct 2024 15:53:54 +0100 Subject: [PATCH] chore: add renovate monitoring --- .github/renovate.json5 | 42 +++++++ .github/renovate/autoMerge.json5 | 14 +++ .github/renovate/commitMessage.json5 | 6 + .github/renovate/labels.json5 | 41 +++++++ .github/renovate/semanticCommits.json5 | 112 ++++++++++++++++++ .github/workflows/renovate.yaml | 78 ++++++++++++ .gitignore | 1 - .gitleaksignore | 3 + .luarc.json | 2 +- .pre-commit-config.yaml | 1 + local/configs/git-hooks.nix | 63 +++++++--- machines/deedee/secrets.sops.yaml | 8 +- modules/apps/zsh/functions/keys.zsh | 1 - modules/system/containers/maddy/maddy.conf | 1 - .../system/containers/piped/config.properties | 1 - 15 files changed, 346 insertions(+), 28 deletions(-) create mode 100644 .github/renovate.json5 create mode 100644 .github/renovate/autoMerge.json5 create mode 100644 .github/renovate/commitMessage.json5 create mode 100644 .github/renovate/labels.json5 create mode 100644 .github/renovate/semanticCommits.json5 create mode 100644 .github/workflows/renovate.yaml create mode 100644 .gitleaksignore create mode 120000 .pre-commit-config.yaml diff --git a/.github/renovate.json5 b/.github/renovate.json5 new file mode 100644 index 0000000..2694b80 --- /dev/null +++ b/.github/renovate.json5 @@ -0,0 +1,42 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base", + ":dependencyDashboard", + ":disableRateLimiting", + "docker:enableMajor", + "docker:pinDigests", + ":automergeDigest", + ":automergePatch", + ":enablePreCommit", + ":timezone(Europe/Warsaw)", + "github>deedee-ops/nixlab//.github/renovate/autoMerge.json5", + "github>deedee-ops/nixlab//.github/renovate/commitMessage.json5", + "github>deedee-ops/nixlab//.github/renovate/labels.json5", + "github>deedee-ops/nixlab//.github/renovate/semanticCommits.json5" + ], + "gitAuthor": "robodexo2000 <150604236+robodexo2000[bot]@users.noreply.github.com>", + "dependencyDashboardTitle": "Renovate Dashboard 🤖", + "suppressNotifications": ["prEditedNotification", "prIgnoreNotification"], + "commitBodyTable": true, + "rebaseWhen": "auto", + + "nix": { + "enabled": "true", + }, + + "lockFileMaintenance": { + "enabled": "true", + "automerge": "true", + "schedule": [ "before 4am on Sunday" ], + }, + + "regexManagers": [ + { + fileMatch: ["^modules/.*\\.nix$", "^flyio/.*\\.toml$"], + matchStrings: [ + 'image *= *"(?.*?):(?.*?)(@(?sha256:[a-f0-9]+))?"', + ], + datasourceTemplate: "docker", + } +} diff --git a/.github/renovate/autoMerge.json5 b/.github/renovate/autoMerge.json5 new file mode 100644 index 0000000..f930014 --- /dev/null +++ b/.github/renovate/autoMerge.json5 @@ -0,0 +1,14 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "packageRules": [ + { + "description": "Auto merge GitHub Actions", + "matchManagers": ["github-actions"], + "matchDatasources": ["github-tags"], + "automerge": true, + "ignoreTests": true, + "automergeType": "branch", + "matchUpdateTypes": ["minor", "patch", "digest"] + } + ] +} diff --git a/.github/renovate/commitMessage.json5 b/.github/renovate/commitMessage.json5 new file mode 100644 index 0000000..66e87bd --- /dev/null +++ b/.github/renovate/commitMessage.json5 @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "to {{newVersion}}", + "commitMessageSuffix": "", +} diff --git a/.github/renovate/labels.json5 b/.github/renovate/labels.json5 new file mode 100644 index 0000000..18d0942 --- /dev/null +++ b/.github/renovate/labels.json5 @@ -0,0 +1,41 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "packageRules": [ + { + "matchUpdateTypes": ["major"], + "labels": ["type/major"] + }, + { + "matchUpdateTypes": ["minor"], + "labels": ["type/minor"] + }, + { + "matchUpdateTypes": ["patch"], + "labels": ["type/patch"] + }, + { + "matchUpdateTypes": ["digest"], + "labels": ["type/digest"] + }, + { + "matchDatasources": ["docker"], + "addLabels": ["renovate/container"] + }, + { + "matchDatasources": ["helm"], + "addLabels": ["renovate/helm"] + }, + { + "matchDatasources": ["terraform-provider"], + "addLabels": ["renovate/tofu"] + }, + { + "matchDatasources": ["github-releases", "github-tags"], + "addLabels": ["renovate/github-release"] + }, + { + "matchManagers": ["github-actions"], + "addLabels": ["renovate/github-action"] + } + ] +} diff --git a/.github/renovate/semanticCommits.json5 b/.github/renovate/semanticCommits.json5 new file mode 100644 index 0000000..1ecc739 --- /dev/null +++ b/.github/renovate/semanticCommits.json5 @@ -0,0 +1,112 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "packageRules": [ + { + "matchDatasources": ["docker"], + "matchUpdateTypes": ["major"], + "commitMessagePrefix": "feat(container)!: ", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": " ( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchDatasources": ["docker"], + "matchUpdateTypes": ["minor"], + "semanticCommitType": "feat", + "semanticCommitScope": "container", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchDatasources": ["docker"], + "matchUpdateTypes": ["patch"], + "semanticCommitType": "fix", + "semanticCommitScope": "container", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchDatasources": ["docker"], + "matchUpdateTypes": ["digest"], + "semanticCommitType": "chore", + "semanticCommitScope": "container", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentDigestShort}} → {{newDigestShort}} )" + }, + { + "matchDatasources": ["helm"], + "matchUpdateTypes": ["major"], + "commitMessagePrefix": "feat(helm)!: ", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchDatasources": ["terraform-provider"], + "matchUpdateTypes": ["major"], + "commitMessagePrefix": "feat(terraform)!: ", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchDatasources": ["terraform-provider"], + "matchUpdateTypes": ["minor"], + "semanticCommitType": "feat", + "semanticCommitScope": "terraform", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchDatasources": ["terraform-provider"], + "matchUpdateTypes": ["patch"], + "semanticCommitType": "fix", + "semanticCommitScope": "terraform", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchDatasources": ["github-releases", "github-tags"], + "matchUpdateTypes": ["major"], + "commitMessagePrefix": "feat(github-release)!: ", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchDatasources": ["github-releases", "github-tags"], + "matchUpdateTypes": ["minor"], + "semanticCommitType": "feat", + "semanticCommitScope": "github-release", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchDatasources": ["github-releases", "github-tags"], + "matchUpdateTypes": ["patch"], + "semanticCommitType": "fix", + "semanticCommitScope": "github-release", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchManagers": ["github-actions"], + "matchUpdateTypes": ["major"], + "commitMessagePrefix": "feat(github-action)!: ", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchManagers": ["github-actions"], + "matchUpdateTypes": ["minor"], + "semanticCommitType": "feat", + "semanticCommitScope": "github-action", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + }, + { + "matchManagers": ["github-actions"], + "matchUpdateTypes": ["patch"], + "semanticCommitType": "fix", + "semanticCommitScope": "github-action", + "commitMessageTopic": "{{depName}}", + "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" + } + ] +} diff --git a/.github/workflows/renovate.yaml b/.github/workflows/renovate.yaml new file mode 100644 index 0000000..ed7455c --- /dev/null +++ b/.github/workflows/renovate.yaml @@ -0,0 +1,78 @@ +# yamllint disable rule:comments +--- +# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json +name: "Renovate" + +'on': + workflow_dispatch: + inputs: + dryRun: + description: Dry Run + default: "false" + required: false + logLevel: + description: Log Level + default: debug + required: false + version: + description: Renovate version + default: latest + required: false + schedule: + - cron: "0 * * * *" # Every hour + push: + branches: + - master + paths: + - .github/renovate.json5 + - .github/renovate/**.json5 + +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true + +# Retrieve BOT_USER_ID via `curl -s "https://api.github.com/users/${BOT_USERNAME}%5Bbot%5D" | jq .id` +env: + RENOVATE_PLATFORM: github + RENOVATE_PLATFORM_COMMIT: true + RENOVATE_ONBOARDING_CONFIG_FILE_NAME: .github/renovate.json5 + RENOVATE_AUTODISCOVER: true + RENOVATE_AUTODISCOVER_FILTER: "${{ github.repository }}" + RENOVATE_USERNAME: "${{ secrets.BOT_USERNAME }}[bot]" + RENOVATE_GIT_AUTHOR: >- + ${{ secrets.BOT_USERNAME }} + <${{ secrets.BOT_USER_ID }}+${{ secrets.BOT_USERNAME }}[bot]@users.noreply.github.com> + WORKFLOW_RENOVATE_DRY_RUN: false + WORKFLOW_RENOVATE_LOG_LEVEL: debug + WORKFLOW_RENOVATE_VERSION: latest + +jobs: + renovate: + name: Renovate + runs-on: ubuntu-latest + steps: + - name: Generate Token + uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1 + id: app-token + with: + app-id: "${{ secrets.BOT_APP_ID }}" + private-key: "${{ secrets.BOT_APP_PRIVATE_KEY }}" + + - name: Checkout + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + with: + token: "${{ steps.app-token.outputs.token }}" + + - name: Override Default Config + shell: bash + run: | + echo "RENOVATE_DRY_RUN=${{ github.event.inputs.dryRun || env.WORKFLOW_RENOVATE_DRY_RUN }}" >> "${GITHUB_ENV}" + echo "LOG_LEVEL=${{ github.event.inputs.logLevel || env.WORKFLOW_RENOVATE_LOG_LEVEL }}" >> "${GITHUB_ENV}" + + - name: Renovate + uses: renovatebot/github-action@80eaf969abf68ad62aa94d9ab392421b31621634 # v40.3.4 + with: + configurationFile: "${{ env.RENOVATE_ONBOARDING_CONFIG_FILE_NAME }}" + token: "${{ steps.app-token.outputs.token }}" + renovate-version: "${{ github.event.inputs.version || env.WORKFLOW_RENOVATE_VERSION }}" +# yamllint enable rule:comments diff --git a/.gitignore b/.gitignore index 052512c..ae81e77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ result tmp .direnv -.pre-commit-config.yaml diff --git a/.gitleaksignore b/.gitleaksignore new file mode 100644 index 0000000..6c1afb8 --- /dev/null +++ b/.gitleaksignore @@ -0,0 +1,3 @@ +30f633ede83f2fa1a25e142287b00c6a0db3070c:modules/system/apps/postgresql/default.nix:hashicorp-tf-password:69 +5ceb97149857e5deb0a58a25b7c0360acce66168:modules/system/apps/postgresql/default.nix:hashicorp-tf-password:50 +4590e239a2ee354f8c9fdd363e2cf349fb8c5969:modules/system/services/adguardhome.nix:hashicorp-tf-password:36 diff --git a/.luarc.json b/.luarc.json index 1e1765c..c7da2db 100644 --- a/.luarc.json +++ b/.luarc.json @@ -2,4 +2,4 @@ "diagnostics.globals": [ "vim" ] -} \ No newline at end of file +} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 120000 index 0000000..17b2a5b --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1 @@ +/nix/store/mfzmcjdwf5b5ca2cm6r1mvzhvbnb0zpm-pre-commit-config.json \ No newline at end of file diff --git a/local/configs/git-hooks.nix b/local/configs/git-hooks.nix index 5aff49a..5e66750 100644 --- a/local/configs/git-hooks.nix +++ b/local/configs/git-hooks.nix @@ -8,29 +8,54 @@ check.enable = true; settings = { - excludes = [ ".direnv" ]; + excludes = [ + ".direnv" + "secrets.tar.gz.enc" + ]; - hooks = { - check-case-conflicts.enable = true; - check-shebang-scripts-are-executable.enable = true; - mixed-line-endings.enable = true; + hooks = + let + inherit (inputs.nixpkgs) lib; + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + in + { + check-case-conflicts.enable = true; + check-executables-have-shebangs.enable = true; + check-merge-conflicts.enable = true; + check-shebang-scripts-are-executable.enable = true; + end-of-file-fixer.enable = true; + fix-byte-order-marker.enable = true; + mixed-line-endings.enable = true; + pre-commit-hook-ensure-sops = { + enable = true; + files = ".+\.sops\..*"; + }; + trim-trailing-whitespace.enable = true; - deadnix.enable = true; - flake-checker.enable = true; - statix.enable = true; - nixfmt-rfc-style.enable = true; + deadnix.enable = true; + flake-checker.enable = true; + statix.enable = true; + nixfmt-rfc-style.enable = true; - lua-ls.enable = true; - shellcheck = { - enable = true; - excludes = [ ".*\.zsh" ]; - }; - stylua.enable = true; - yamllint.enable = true; + lua-ls.enable = true; + shellcheck = { + enable = true; + excludes = [ ".*\.zsh" ]; + }; + stylua.enable = true; + yamllint.enable = true; + + actionlint.enable = true; + commitizen.enable = true; - actionlint.enable = true; - commitizen.enable = true; - }; + # custom hooks + gitleaks = { + enable = true; + name = "gitleaks"; + package = pkgs.gitleaks; + entry = "${lib.getExe pkgs.gitleaks} protect --verbose --redact --staged"; + }; + }; }; }; }; diff --git a/machines/deedee/secrets.sops.yaml b/machines/deedee/secrets.sops.yaml index f11b0ee..b903ef1 100644 --- a/machines/deedee/secrets.sops.yaml +++ b/machines/deedee/secrets.sops.yaml @@ -20,7 +20,7 @@ system: AUTHELIA_IDENTITY_PROVIDERS_OIDC_HMAC_SECRET: ENC[AES256_GCM,data:KBTMgh3kE2xhAirF8TtZIrNgP418zZDQj4JJ4rF2t+0Rj3XzdE7pzE4ZO3LC0tuLjrVJNVdoQrBl7bv1OH8hPA==,iv:y6Ri1xrTg5b+d+TbIYTzSILzujHT8BhFl3gHCOjHUA0=,tag:AWrPQ6DdhXypNvVW9roP5w==,type:str] AUTHELIA_IDENTITY_PROVIDERS_OIDC_JWKS_KEY: ENC[AES256_GCM,data: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,iv:kIJbfabl6o8c3I2NYkH0tg7ctlHYI3rmeeJh7lWHkns=,tag:OStddeUeFUPwUteI63UeGw==,type:str] AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET: ENC[AES256_GCM,data:0DTKEeHoeK6DZCJwEkSqAC162SNoF4QVvyDuREfB0gKEWpuia/XTbaxjS7qnOewRkUNp4zF2luzyXDvR2A7dlQ==,iv:BbomuOhRZ/okLfa6zvP5642hyTeeNkeRR7q+yYf8DQU=,tag:7aGmk0ZVhICgpJniTjxPCg==,type:str] - AUTHELIA_SESSION_REDIS_PASSWORD: null + AUTHELIA_SESSION_REDIS_PASSWORD: ENC[AES256_GCM,data:bYlJYJ0+8MGFtXs=,iv:KQh0FlZ/cddPPyVayRFE7db/ZhwbjwMSGZ4KHkPm8PI=,tag:GD4v/rrcQrpKwXNQamolBA==,type:str] AUTHELIA_SESSION_SECRET: ENC[AES256_GCM,data:VpfpyvLT9GD7j9opJBRGoClYkW0msX+VmkZcRIX36vbyl7b2Xnc9mHNOcQBFQKbmzMXvpOigcE4dkAS0Sje4lQ==,iv:biHN12Qf4DaLtylUqBThfXUAvdnzzCYmiJAdk7Eyd3w=,tag:JpP4OXejR6SZGxrrHIyOng==,type:str] AUTHELIA_STORAGE_ENCRYPTION_KEY: ENC[AES256_GCM,data:zbNkm26j8sLViarc5jFnKGolqGQZGkzYVjMtuxokJNVtBXOw1kL8d0hTmyZBCmIqxqe7AUwIGAE6zBB/TjRz6g==,iv:jBiyA5F5KuBRvk9zdstrqLTWjQJMgx7nJPbmfebfnxw=,tag:pXm28S/k7cO23GnSj4RG5w==,type:str] AUTHELIA_STORAGE_POSTGRES_PASSWORD: ENC[AES256_GCM,data:6rFJAxj2e5dod4AlA2g6FoEJiIg8OMlx0i8/mBjvgnGR/DEaeWDQ5w==,iv:FGIwOjV2IiIxOTRzuEvmijIh+pLp3Aoxo8s7CLq9ky4=,tag:pXQHHHUWGQUAghxfuW3AXA==,type:str] @@ -29,7 +29,7 @@ system: APP_KEY: ENC[AES256_GCM,data:ks/31NYsRRo9SrEbRfeQhUxn9pRfvXYExhUY9y84TXA=,iv:vn8R/bJU2PFbQjOsKNRerj3uNAynjwInalWGCYjGVI0=,tag:ME3XtRW7EkpgiY/banycsQ==,type:str] DB_PASSWORD: ENC[AES256_GCM,data:cTjz86AvlhssWmmmF2XpEsisCfAiIZgp6fitnQblYIV9gqh6sndgVg==,iv:hlfQLKkNNkLACazzRMZWqKomsUqH5/hOg1npbJaAayA=,tag:DQ/T364vG1a4rN8c4QC/BA==,type:str] FIREFLY_III_TOKEN: ENC[AES256_GCM,data:yr+s0fvzYY+Rrx8HKbPYgOiYjeafLP9M+ohEse1CVfM=,iv:uNhTHVgNXB0kuiBZowNc7PA2iKtjqooFj6wFgEuoyKI=,tag:f0dXyaXPzOKLWTu/T/nRMw==,type:str] - REDIS_PASSWORD: null + REDIS_PASSWORD: ENC[AES256_GCM,data:PfLOGVjwuwWwDdA=,iv:uqDUtrPLpX8WZWaqYzp7BaARPz4FcoAEkHi07rGbZsM=,tag:H0b8nyThH6P4Vy4zqrMkug==,type:str] firefoxsync: env: FIREFOXSYNC__POSTGRES_PASSWORD: ENC[AES256_GCM,data:JbwOPfE0OrfplFtGrZRTlWn7z5/YA9jKH22waNIGUduHnxFfut6gWA==,iv:lex3Z+6bQWTjcQcO89Hj/wndXA13UM+sTLaq0j8Wupc=,tag:sgqbma6rLOkWN5FrwXrMVg==,type:str] @@ -97,8 +97,8 @@ sops: c3FoaFNzbjJubzlBckdDb2lNOUZtOGMKRbHxa1B3QAdredBMTd7W7g3kRz6l8uyV bBclsA8Gm7p+6ndV39sN+Daqm5MyggY1Prwv/Ukdd5Q+1C+XsEW6OQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-27T12:48:55Z" - mac: ENC[AES256_GCM,data:HxVRmEpaNfxJ12R3D2nzLLNZxVMZnk3gL+AsXRSHcT1xnL+XueYS0y16XSPriMFv5XiFE9x5eHluKvnSA8AXMiP1M7K2Y9Goai/TescHRph35My75j7lnOA3bOjYfyJKj5WFYVb3/rdiAbinDSBafCQEtUIFNHH5KvZLB8aK6Cs=,iv:L6iZIEW61LD3MGD0dYypFKqAIioyHQeWxgm8ZOQdCWM=,tag:mCyFL3guwkazD2eNCD+idw==,type:str] + lastmodified: "2024-10-27T14:06:05Z" + mac: ENC[AES256_GCM,data:XO4THe4o+f3FdTzlTr8UT0E6xKmr6pFnlL3lnxTaDNltkNKUmrWwXO6O3A4G/6KmxGvjbg8yAh+DRR0+qJLVxJUHJB4gJnvouJZa22aE7V1iXuRYRNM+VOnxZMCNa7oLCO0Nt7pBIJ1dxytGI2+02VZ4ma5TAhDg0rZUmBI8kCE=,iv:ThUkKU/j/lcdhUICVnCq1xgkE5n9vr5kxfrTtVHChcY=,tag:siUBovLluQse7n5x3PVk1Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/modules/apps/zsh/functions/keys.zsh b/modules/apps/zsh/functions/keys.zsh index 780292d..a4f1021 100644 --- a/modules/apps/zsh/functions/keys.zsh +++ b/modules/apps/zsh/functions/keys.zsh @@ -15,4 +15,3 @@ bindkey '^[[1;5C' forward-word # [Ctrl-LeftArrow] - move backward one word bindkey '^[[1;5D' backward-word - diff --git a/modules/system/containers/maddy/maddy.conf b/modules/system/containers/maddy/maddy.conf index 2578f1b..03ff979 100644 --- a/modules/system/containers/maddy/maddy.conf +++ b/modules/system/containers/maddy/maddy.conf @@ -29,4 +29,3 @@ target.smtp remote_smtp { auth plain {env:EGRESS_USERNAME} {env:EGRESS_PASSWORD} targets tls://{env:EGRESS_HOST}:{env:EGRESS_PORT} } - diff --git a/modules/system/containers/piped/config.properties b/modules/system/containers/piped/config.properties index eb2c7f5..8c95289 100644 --- a/modules/system/containers/piped/config.properties +++ b/modules/system/containers/piped/config.properties @@ -84,4 +84,3 @@ hibernate.connection.password:@@PIPED_DB_PASSWORD@@ # Frontend configuration #frontend.statusPageUrl:changeme #frontend.donationUrl:changeme -