summaryrefslogtreecommitdiff
path: root/flora/services
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flora/services/akkoma.nix15
-rw-r--r--flora/services/picarones.nix26
-rw-r--r--flora/services/znc.nix43
-rw-r--r--pkgs/patches/akkoma-fe-toki-pona.patch (renamed from flora/services/akkoma-fe-toki-pona.patch)0
-rw-r--r--pkgs/patches/akkoma-toki-pona.patch (renamed from flora/services/akkoma-toki-pona.patch)0
-rw-r--r--pkgs/patches/cgit-main-instead-of-master.patch (renamed from flora/services/0001-main-instead-of-master-branch.patch)0
6 files changed, 7 insertions, 77 deletions
diff --git a/flora/services/akkoma.nix b/flora/services/akkoma.nix
index 5a2c8f3..756f2a7 100644
--- a/flora/services/akkoma.nix
+++ b/flora/services/akkoma.nix
@@ -26,11 +26,12 @@ in
isReadOnly = true;
};
- config = {pkgs, config, ...}: {
+ config = {config, ...}: {
# generating the manual will fail when mixing nixos channels,
# so disable it here or this won't build at all.
documentation.enable = false;
+ nixpkgs.pkgs = pkgs;
system.stateVersion = "22.11";
@@ -39,9 +40,7 @@ in
frontends = {
primary = {
- package = pkgs.akkoma-frontends.akkoma-fe.overrideAttrs (old: {
- patches = [ ./akkoma-fe-toki-pona.patch ];
- });
+ package = pkgs.akkoma-fe;
name = "pleroma-fe";
ref = "stable";
};
@@ -52,10 +51,6 @@ in
};
};
- package = pkgs.akkoma.overrideAttrs (old: {
- patches = [ ./akkoma-toki-pona.patch ];
- });
-
extraStatic."static/terms-of-service.html" = pkgs.writeText "terms-of-service-html" ''
<p>toki!</p>
<p>lawa kepeken pi tomo akkoma ni li lili: sina li mi la, sina ken kepeken e tomo ni.</p>
@@ -81,6 +76,10 @@ in
description = "a test instance";
email = "dings@dings";
};
+ ":restrict_unauthenticated" = {
+ timelines = true;
+ activities = true;
+ };
":media_proxy" = {
enabled = false;
redirect_on_failure = true;
diff --git a/flora/services/picarones.nix b/flora/services/picarones.nix
deleted file mode 100644
index c2e3c7b..0000000
--- a/flora/services/picarones.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{config, pkgs, ...}:
-let
- source = builtins.fetchGit {
- url = "https://stuebinm.eu/git/picarones/";
- rev = "0596b9f6c561daa67945adb81570efd30650dffd";
- };
-in
-{
-
- imports = [ source.outPath ];
-
- services.picarones = {
- enable = true;
- frontend = {
- enable = true;
- domain = "picarones.stuebinm.eu";
- proxyBackend = true;
- config = {
- enableACME = true;
- forceSSL = true;
- };
- };
- };
-
- networking.firewall.allowedTCPPorts = [ 80 443 ];
-}
diff --git a/flora/services/znc.nix b/flora/services/znc.nix
deleted file mode 100644
index e81bc65..0000000
--- a/flora/services/znc.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- services.znc = {
- enable = true;
- mutable = false;
- useLegacyConfig = false;
- openFirewall = true;
-
- config = {
- LoadModule = [ "adminlog" "webadmin" ];
- Listener.l = {
- IPv4 = true;
- IPv6 = false;
- AllowIRC = true;
- AllowWeb = true;
- Port = 12345;
- SSL = true;
- };
- User.stuebinm = {
- Admin = true;
- BindHost = "0.0.0.0";
- LoadModule = [ "chansaver" "controlpanel" "sasl" ];
- QuitMsg = "fell into a looping fixpoint operator";
- RealName = "stuebinm";
- Pass.password = {
- Method = "sha256";
- Hash = "a0dd4be1f8959dc9c775a76779bfb8fab52e43b89bad24d85bdc28caa3499710";
- Salt = "eNT_:x1SgMvQNJAW0J!Q";
- };
- Network.libera = {
- IRCConnectEnabled = true;
- LoadModule = [ "simple_away" "sasl" ];
- Server = [ "irc.libera.chat +6697" ];
- TrustAllCerts = false;
- TrustPKI = true;
- };
- };
- };
- };
-
- networking.firewall.allowedTCPPorts = [ 12345 ];
-}
diff --git a/flora/services/akkoma-fe-toki-pona.patch b/pkgs/patches/akkoma-fe-toki-pona.patch
index 281fdfc..281fdfc 100644
--- a/flora/services/akkoma-fe-toki-pona.patch
+++ b/pkgs/patches/akkoma-fe-toki-pona.patch
diff --git a/flora/services/akkoma-toki-pona.patch b/pkgs/patches/akkoma-toki-pona.patch
index 4cff3fa..4cff3fa 100644
--- a/flora/services/akkoma-toki-pona.patch
+++ b/pkgs/patches/akkoma-toki-pona.patch
diff --git a/flora/services/0001-main-instead-of-master-branch.patch b/pkgs/patches/cgit-main-instead-of-master.patch
index 21f6b00..21f6b00 100644
--- a/flora/services/0001-main-instead-of-master-branch.patch
+++ b/pkgs/patches/cgit-main-instead-of-master.patch