diff --git a/hosts/Emitter.nix b/hosts/Emitter.nix index 7efdace..5aa3ac7 100644 --- a/hosts/Emitter.nix +++ b/hosts/Emitter.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { imports = [ - ./gitea.nix + ./forgejo.nix ./tls_sni.nix ]; diff --git a/hosts/gitea-custom/public/css/fonts.css b/hosts/forgejo-custom/public/css/fonts.css similarity index 100% rename from hosts/gitea-custom/public/css/fonts.css rename to hosts/forgejo-custom/public/css/fonts.css diff --git a/hosts/gitea-custom/public/css/jupyter.css b/hosts/forgejo-custom/public/css/jupyter.css similarity index 100% rename from hosts/gitea-custom/public/css/jupyter.css rename to hosts/forgejo-custom/public/css/jupyter.css diff --git a/hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.eot b/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.eot similarity index 100% rename from hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.eot rename to hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.eot diff --git a/hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.svg b/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.svg similarity index 100% rename from hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.svg rename to hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.svg diff --git a/hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.ttf b/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.ttf similarity index 100% rename from hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.ttf rename to hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.ttf diff --git a/hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff b/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff similarity index 100% rename from hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff rename to hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff diff --git a/hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff2 b/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff2 similarity index 100% rename from hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff2 rename to hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-700.woff2 diff --git a/hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.eot b/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.eot similarity index 100% rename from hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.eot rename to hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.eot diff --git a/hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.svg b/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.svg similarity index 100% rename from hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.svg rename to hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.svg diff --git a/hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.ttf b/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.ttf similarity index 100% rename from hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.ttf rename to hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.ttf diff --git a/hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff b/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff similarity index 100% rename from hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff rename to hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff diff --git a/hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff2 b/hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff2 similarity index 100% rename from hosts/gitea-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff2 rename to hosts/forgejo-custom/public/fonts/fira-code-v21-latin-ext_latin_greek_cyrillic-regular.woff2 diff --git a/hosts/gitea-custom/public/fonts/hammersmith-one-v17-latin-regular.eot b/hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.eot similarity index 100% rename from hosts/gitea-custom/public/fonts/hammersmith-one-v17-latin-regular.eot rename to hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.eot diff --git a/hosts/gitea-custom/public/fonts/hammersmith-one-v17-latin-regular.svg b/hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.svg similarity index 100% rename from hosts/gitea-custom/public/fonts/hammersmith-one-v17-latin-regular.svg rename to hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.svg diff --git a/hosts/gitea-custom/public/fonts/hammersmith-one-v17-latin-regular.ttf b/hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.ttf similarity index 100% rename from hosts/gitea-custom/public/fonts/hammersmith-one-v17-latin-regular.ttf rename to hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.ttf diff --git a/hosts/gitea-custom/public/fonts/hammersmith-one-v17-latin-regular.woff b/hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.woff similarity index 100% rename from hosts/gitea-custom/public/fonts/hammersmith-one-v17-latin-regular.woff rename to hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.woff diff --git a/hosts/gitea-custom/public/fonts/hammersmith-one-v17-latin-regular.woff2 b/hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.woff2 similarity index 100% rename from hosts/gitea-custom/public/fonts/hammersmith-one-v17-latin-regular.woff2 rename to hosts/forgejo-custom/public/fonts/hammersmith-one-v17-latin-regular.woff2 diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.eot b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.eot similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.eot rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.eot diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.svg b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.svg similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.svg rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.svg diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.ttf b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.ttf similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.ttf rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.ttf diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff2 b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff2 similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff2 rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700.woff2 diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.eot b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.eot similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.eot rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.eot diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.svg b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.svg similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.svg rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.svg diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.ttf b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.ttf similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.ttf rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.ttf diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff2 b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff2 similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff2 rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-700italic.woff2 diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.eot b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.eot similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.eot rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.eot diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.svg b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.svg similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.svg rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.svg diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.ttf b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.ttf similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.ttf rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.ttf diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff2 b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff2 similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff2 rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-italic.woff2 diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.eot b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.eot similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.eot rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.eot diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.svg b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.svg similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.svg rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.svg diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.ttf b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.ttf similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.ttf rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.ttf diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff diff --git a/hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff2 b/hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff2 similarity index 100% rename from hosts/gitea-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff2 rename to hosts/forgejo-custom/public/fonts/vollkorn-v21-latin-ext_latin_greek_cyrillic-regular.woff2 diff --git a/hosts/gitea-custom/public/img/apple-touch-icon.png b/hosts/forgejo-custom/public/img/apple-touch-icon.png similarity index 100% rename from hosts/gitea-custom/public/img/apple-touch-icon.png rename to hosts/forgejo-custom/public/img/apple-touch-icon.png diff --git a/hosts/gitea-custom/public/img/avatar_default.png b/hosts/forgejo-custom/public/img/avatar_default.png similarity index 100% rename from hosts/gitea-custom/public/img/avatar_default.png rename to hosts/forgejo-custom/public/img/avatar_default.png diff --git a/hosts/gitea-custom/public/img/favicon.png b/hosts/forgejo-custom/public/img/favicon.png similarity index 100% rename from hosts/gitea-custom/public/img/favicon.png rename to hosts/forgejo-custom/public/img/favicon.png diff --git a/hosts/gitea-custom/public/img/favicon.svg b/hosts/forgejo-custom/public/img/favicon.svg similarity index 100% rename from hosts/gitea-custom/public/img/favicon.svg rename to hosts/forgejo-custom/public/img/favicon.svg diff --git a/hosts/gitea-custom/public/img/logo.png b/hosts/forgejo-custom/public/img/logo.png similarity index 100% rename from hosts/gitea-custom/public/img/logo.png rename to hosts/forgejo-custom/public/img/logo.png diff --git a/hosts/gitea-custom/public/img/logo.svg b/hosts/forgejo-custom/public/img/logo.svg similarity index 100% rename from hosts/gitea-custom/public/img/logo.svg rename to hosts/forgejo-custom/public/img/logo.svg diff --git a/hosts/gitea-custom/templates/custom/extra_links_footer.tmpl b/hosts/forgejo-custom/templates/custom/extra_links_footer.tmpl similarity index 100% rename from hosts/gitea-custom/templates/custom/extra_links_footer.tmpl rename to hosts/forgejo-custom/templates/custom/extra_links_footer.tmpl diff --git a/hosts/gitea-custom/templates/custom/header.tmpl b/hosts/forgejo-custom/templates/custom/header.tmpl similarity index 100% rename from hosts/gitea-custom/templates/custom/header.tmpl rename to hosts/forgejo-custom/templates/custom/header.tmpl diff --git a/hosts/gitea-custom/templates/home.tmpl b/hosts/forgejo-custom/templates/home.tmpl similarity index 100% rename from hosts/gitea-custom/templates/home.tmpl rename to hosts/forgejo-custom/templates/home.tmpl diff --git a/hosts/gitea.nix b/hosts/forgejo.nix similarity index 82% rename from hosts/gitea.nix rename to hosts/forgejo.nix index 9de795d..ce2ff36 100644 --- a/hosts/gitea.nix +++ b/hosts/forgejo.nix @@ -2,18 +2,17 @@ let domain = "git.25120.org"; - giteaCustom = pkgs.callPackage ../packages/directory.nix { - name = "gitea-custom"; - source = ./gitea-custom; + forgejoCustom = pkgs.callPackage ../packages/directory.nix { + name = "forgejo-custom"; + source = ./forgejo-custom; }; in { - services.gitea = { + services.forgejo = { enable = true; - appName = "${domain}"; database = { type = "postgres"; - passwordFile = "/secrets/gitea_db_password"; + passwordFile = "/secrets/forgejo_db_password"; createDatabase = false; }; repositoryRoot = "/data/git/repositories"; @@ -22,12 +21,13 @@ in contentDir = "/data/git/data/lfs"; }; settings = let + python = pkgs.python311; docutils = - pkgs.python310.withPackages (ps: with ps; [ + python.withPackages (ps: with ps; [ docutils # Provides rendering of ReStructured Text files pygments # Provides syntax highlighting ]); - nbconvert = pkgs.python310.withPackages (ps: with ps; [ + nbconvert = python.withPackages (ps: with ps; [ jupyter ipykernel nbconvert @@ -41,7 +41,7 @@ in input_file="$1" command="${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic" - cache_directory="${config.services.gitea.stateDir}/markup_cache/jupyter" + cache_directory="${config.services.forgejo.stateDir}/markup_cache/jupyter" max_cache_file_count="${toString max_cached_jupyter_notebooks}" cache_file="$cache_directory/$(md5sum "$input_file" | cut -d' ' -f1)" @@ -64,6 +64,7 @@ in ''; in { + DEFAULT.APP_NAME = "${domain}"; server = { SSH_PORT = lib.head config.services.openssh.ports; ROOT_URL = "https://${domain}/"; @@ -72,6 +73,7 @@ in }; service.DISABLE_REGISTRATION = true; session.COOKIE_SECURE = true; + UI.DEFAULT_THEME = "forgejo-auto"; "markup.restructuredtext" = { ENABLED = true; FILE_EXTENSIONS = ".rst"; @@ -103,11 +105,11 @@ in services.postgresql = { enable = true; authentication = '' - local gitea all ident map=gitea-users + local forgejo all ident map=forgejo-users ''; - # Map the gitea user to postgresql + # Map the forgejo user to postgresql identMap = '' - gitea-users gitea gitea + forgejo-users forgejo forgejo ''; }; @@ -124,14 +126,14 @@ in }; }; - # users.users.gitea.extraGroups = [ "keys" ]; - systemd.services.gitea = { + # users.users.forgejo.extraGroups = [ "keys" ]; + systemd.services.forgejo = { serviceConfig = { ReadOnlyPaths = [ "/secrets" ]; }; preStart = '' - cp -frT "${giteaCustom}/" "${config.services.gitea.stateDir}/custom/" - find "${config.services.gitea.stateDir}/custom/" -type d -exec chmod 0750 '{}' + -or -type f -exec chmod 0640 '{}' + + cp -frT "${forgejoCustom}/" "${config.services.forgejo.stateDir}/custom/" + find "${config.services.forgejo.stateDir}/custom/" -type d -exec chmod 0750 '{}' + -or -type f -exec chmod 0640 '{}' + ''; };