diff --git a/.github/workflows/flake-update.yml b/.github/workflows/flake-update.yml index 84bcbf7..007ad57 100644 --- a/.github/workflows/flake-update.yml +++ b/.github/workflows/flake-update.yml @@ -61,25 +61,25 @@ jobs: with: path: pr_body.template contents: | - - The following Nix Flake inputs were updated: + - The following Nix Flake inputs were updated: - Flake input changes: + Flake input changes: - ```shell - ${{ env.UPDATE_LOG }} - ``` + ```shell + ${{ env.UPDATE_LOG }} + ``` - Flake evaluation diff: + Flake evaluation diff: - ```shell - nix-diff-placeholder - ``` + ```shell + nix-diff-placeholder + ``` - Auto-generated by [update.yml][1] with the help of - [create-pull-request][2]. + Auto-generated by [update.yml][1] with the help of + [create-pull-request][2]. - [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml - [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request + [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml + [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request - name: Generate PR body uses: pedrolamas/handlebars-action@v2.4.0 # v2.4.0 with: diff --git a/systems/palatine-hill/gitea.nix b/systems/palatine-hill/gitea.nix index a0728bb..9cffbaf 100644 --- a/systems/palatine-hill/gitea.nix +++ b/systems/palatine-hill/gitea.nix @@ -27,6 +27,12 @@ in SSH_PORT = 2222; SSH_LISTEN_PORT = 2223; START_SSH_SERVER = true; + PUBLIC_URL_DETECTION = "auto"; + }; + repository = { + ENABLE_PUSH_CREATE_USER = true; + DEFAULT_MERGE_STYLE = "rebase-merge"; + }; service = { DISABLE_REGISTRATION = true; @@ -45,6 +51,15 @@ in host = "192.168.76.2"; port = "8088"; }; + "storage.minio" = { + STORAGE_TYPE = "minio"; + MINIO_ENDPOINT = "minio.nayeonie.com"; + MINIO_BUCKET = "gitea"; + MINIO_LOCATION = "us-east-1"; + MINIO_USE_SSL = true; + MINIO_INSECURE_SKIP_VERIFY = false; + MINIO_BUCKET_LOOKUP_TYPE = "auto"; + }; }; stateDir = base_path; lfs.enable = true; @@ -60,5 +75,6 @@ in sops.secrets = { "gitea/dbpass".owner = "gitea"; + "gitea/minio".owner = "gitea"; }; } diff --git a/systems/palatine-hill/secrets.yaml b/systems/palatine-hill/secrets.yaml index 31f68bc..c1afa14 100644 --- a/systems/palatine-hill/secrets.yaml +++ b/systems/palatine-hill/secrets.yaml @@ -10,6 +10,7 @@ postgres: init: ENC[AES256_GCM,data:trwA30EswHEPa6V2GuHsGgU4NK/j/UQveldwHng0Ilwyqh9aZCgF3axP48MmcciBssux8DZ4O5U=,iv:VC+tpG5yuiBE7pjZ85lYCwHG/bTePxeXQDz2zyLyLYA=,tag:5+jwWTv5T5YWwQpR58QfOA==,type:str] gitea: dbpass: ENC[AES256_GCM,data:8jECcEJ8JnK7fztTckzLrQ==,iv:yQMp5VrierOKXwiop0NUA7Qbn2eH5iUCVlKppZwKLIQ=,tag:rI9WT7zLIaFxVcTu3ufW4g==,type:str] + minio: ENC[AES256_GCM,data:LxY6AD+CZ9VQEl5FrG6o0XiOiizLcwiLiyH1WJD8mMCPWhDjGzt+k+YPOm1BpWzTZF8+2EoxR9oKFJu9mzTibl2Ieits0/RNwh1VdQALXw3FwfRym7CFS+Z5S8H9kGMoXWRrr+I5,iv:g/wq0r2HKfX2AwirT4hm/H1Ms/mtbf4ZuFLISikRyoI=,tag:he99s/WpKoN+lHR8r4K30w==,type:str] upsmon: password: ENC[AES256_GCM,data:52Rxsh7KUq+aYjQORBC+Yq5B,iv:F05g/a5bv7DQ+eLlMqsNeRHLxzl7AyXU1zAlmFevQ6o=,tag:xkGDD3hDF+u5fUbP33OrlA==,type:str] minio: @@ -30,10 +31,6 @@ server-validation: typhon: hashedPassword: ENC[AES256_GCM,data:gMyY8gxUn3HzycQRu2cminqRFWghqWcjzZzTxAQZ5PJqn604iSwDiVdr7icHB7drJfCAfsE7L4oKRJgxaIAE32043oOkb2T7DDH8y2jxMzqmZCfbvrfMI4wdfRTHGqzxb6X/aZ5ai2rr1Q==,iv:4EsTo/lQld0o9iktDX9gobMlPUCitx1i9wn8EL16sIs=,tag:FgVDRHk2glDwpC/mprrPqQ==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age1qw5k8h72k3fjg5gmlxx8q8gwlc2k6n6u08d8hdzpm2pk9r0fnfxsmw33nh enc: | @@ -44,8 +41,8 @@ sops: cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-26T05:47:58Z" - mac: ENC[AES256_GCM,data:ZP9HglMmn9FDv6/vtQAxz/qP76QniPqM6bzMQVvVU/OhDmjuneGKZY7d1Es7LC9o5qmJ+T3Dh3/bkmuRdgdnd2TO6iuvM++DEPxwnoHis+0lbMxv5a6ibzvoXXm2CrL4HPETqLKbLahGJRmDNgnkCEWxAs16zrqe5kgDpD53R5c=,iv:DcCXNGyb41ToV9uSnrnrl0dWiw2pvykM8z86Yk814P4=,tag:T9PFl48qABwBSy7vIhSmLA==,type:str] + lastmodified: "2025-05-30T04:36:41Z" + mac: ENC[AES256_GCM,data:fEsUt5g0/7j8IVgtXQ0thV93dxe6SGCglqeHdnaXFOjKcCUEFWUmi98M8X92hR9AJzscRK6wqzijd/AQBzl+GL2QtDYsn8qx9Nr0DBd6Gh1vi25eh5LtADm09COSae1THWuFLP7L1Qamyt+XzlBa7Xnrzfuzzp0s2/cZoxZiueU=,iv:VYzh833cMQwGmkB6QunRys0Eluz+0KGj8Y43B9icE9w=,tag:EWJSizBMTFZ0TZhncYe2Sw==,type:str] pgp: - created_at: "2024-11-28T18:56:39Z" enc: |- @@ -60,4 +57,4 @@ sops: -----END PGP MESSAGE----- fp: 5EFFB75F7C9B74EAA5C4637547940175096C1330 unencrypted_suffix: _unencrypted - version: 3.9.4 + version: 3.10.2