diff options
| author | K900 <me@0upti.me> | 2023-02-14 22:43:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 22:43:49 +0300 |
| commit | 03ce4617e8ffa83e6544e2a0bf76cf384a2899cf (patch) | |
| tree | 754e711b069cbe6d1a17f30c6adc08e338fec4af /nixos | |
| parent | 8cf41cf4ef071b33a791daa01c971d66aa4f878d (diff) | |
| parent | 7cccc07ab2acf7e3935c3673d2a8df54762ba7b5 (diff) | |
| download | nixpkgs-03ce4617e8ffa83e6544e2a0bf76cf384a2899cf.tar nixpkgs-03ce4617e8ffa83e6544e2a0bf76cf384a2899cf.tar.gz nixpkgs-03ce4617e8ffa83e6544e2a0bf76cf384a2899cf.tar.bz2 nixpkgs-03ce4617e8ffa83e6544e2a0bf76cf384a2899cf.tar.lz nixpkgs-03ce4617e8ffa83e6544e2a0bf76cf384a2899cf.tar.xz nixpkgs-03ce4617e8ffa83e6544e2a0bf76cf384a2899cf.tar.zst nixpkgs-03ce4617e8ffa83e6544e2a0bf76cf384a2899cf.zip | |
Merge pull request #216072 from illdefined/akkoma
akkoma: 3.5.0 → 3.6.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/akkoma.md | 8 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/akkoma.nix | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/nixos/modules/services/web-apps/akkoma.md b/nixos/modules/services/web-apps/akkoma.md index fc849be0c87..5419940a68d 100644 --- a/nixos/modules/services/web-apps/akkoma.md +++ b/nixos/modules/services/web-apps/akkoma.md @@ -152,7 +152,7 @@ services.akkoma.config.":pleroma".":media_preview_proxy" = { ## Frontend management {#modules-services-akkoma-frontend-management} -Akkoma will be deployed with the `pleroma-fe` and `admin-fe` frontends by default. These can be +Akkoma will be deployed with the `akkoma-fe` and `admin-fe` frontends by default. These can be modified by setting [{option}`services.akkoma.frontends`](options.html#opt-services.akkoma.frontends). @@ -160,7 +160,7 @@ The following example overrides the primary frontend’s default configuration u derivation. ```nix -services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { +services.akkoma.frontends.primary.package = pkgs.runCommand "akkoma-fe" { config = builtins.toJSON { expertLevel = 1; collapseMessageWithSubject = false; @@ -177,10 +177,10 @@ services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { passAsFile = [ "config" ]; } '' mkdir $out - lndir ${pkgs.akkoma-frontends.pleroma-fe} $out + lndir ${pkgs.akkoma-frontends.akkoma-fe} $out rm $out/static/config.json - jq -s add ${pkgs.akkoma-frontends.pleroma-fe}/static/config.json ${config} \ + jq -s add ${pkgs.akkoma-frontends.akkoma-fe}/static/config.json ${config} \ >$out/static/config.json ''; ``` diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index fc482ff32de..8d177525861 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -51,13 +51,13 @@ let package = mkOption { type = types.package; description = mdDoc "Akkoma frontend package."; - example = literalExpression "pkgs.akkoma-frontends.pleroma-fe"; + example = literalExpression "pkgs.akkoma-frontends.akkoma-fe"; }; name = mkOption { type = types.nonEmptyStr; description = mdDoc "Akkoma frontend name."; - example = "pleroma-fe"; + example = "akkoma-fe"; }; ref = mkOption { @@ -476,8 +476,8 @@ in { type = with types; attrsOf (submodule frontend); default = { primary = { - package = pkgs.akkoma-frontends.pleroma-fe; - name = "pleroma-fe"; + package = pkgs.akkoma-frontends.akkoma-fe; + name = "akkoma-fe"; ref = "stable"; }; admin = { @@ -489,8 +489,8 @@ in { defaultText = literalExpression '' { primary = { - package = pkgs.akkoma-frontends.pleroma-fe; - name = "pleroma-fe"; + package = pkgs.akkoma-frontends.akkoma-fe; + name = "akkoma-fe"; ref = "stable"; }; admin = { |