From 00134d07d8289ca8d35911444f5e0d7b94d212d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 24 Oct 2023 22:26:08 +0200 Subject: [PATCH 1/4] move the wiki to an flake --- flake.lock | 36 +++++++++ flake.nix | 8 ++ nixos/eve/configuration.nix | 1 - nixos/eve/modules/nixos-wiki/backup.nix | 78 ------------------ nixos/eve/modules/nixos-wiki/default.nix | 99 +---------------------- nixos/eve/modules/nixos-wiki/nixos.png | Bin 6093 -> 0 bytes nixos/flake-module.nix | 2 + 7 files changed, 50 insertions(+), 174 deletions(-) delete mode 100644 nixos/eve/modules/nixos-wiki/backup.nix delete mode 100644 nixos/eve/modules/nixos-wiki/nixos.png diff --git a/flake.lock b/flake.lock index 30b59bb6f..0d2083c04 100644 --- a/flake.lock +++ b/flake.lock @@ -413,6 +413,41 @@ "type": "github" } }, + "nixos-wiki": { + "inputs": { + "disko": [ + "disko" + ], + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ], + "sops-nix": [ + "sops-nix" + ], + "srvos": [ + "srvos" + ], + "treefmt-nix": [ + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1698166409, + "narHash": "sha256-fvy+NF8HPwICa9ow751QmR+nn7svCV8xlBtqkfwJEs8=", + "owner": "Mic92", + "repo": "nixos-wiki-infra", + "rev": "01c7bb163be0eeb6330d315e4e7eb081e8505406", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nixos-wiki-infra", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1682741954, @@ -544,6 +579,7 @@ "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", + "nixos-wiki": "nixos-wiki", "nixpkgs": "nixpkgs_2", "nur-packages": "nur-packages", "retiolum": "retiolum", diff --git a/flake.nix b/flake.nix index 162702f1d..d7f95fc90 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,14 @@ flake-utils.url = "github:numtide/flake-utils"; + nixos-wiki.url = "github:Mic92/nixos-wiki-infra"; + nixos-wiki.inputs.nixpkgs.follows = "nixpkgs"; + nixos-wiki.inputs.flake-parts.follows = "flake-parts"; + nixos-wiki.inputs.treefmt-nix.follows = "treefmt-nix"; + nixos-wiki.inputs.disko.follows = "disko"; + nixos-wiki.inputs.sops-nix.follows = "sops-nix"; + nixos-wiki.inputs.srvos.follows = "srvos"; + #microvm.url = "github:astro/microvm.nix"; #microvm.inputs.nixpkgs.follows = "nixpkgs"; #microvm.inputs.flake-utils.follows = "flake-utils"; diff --git a/nixos/eve/configuration.nix b/nixos/eve/configuration.nix index 2204c4fbf..36d0086ef 100644 --- a/nixos/eve/configuration.nix +++ b/nixos/eve/configuration.nix @@ -60,7 +60,6 @@ ./modules/users.nix ./modules/wireguard.nix ./modules/nixos-wiki - ./modules/nixos-wiki/backup.nix ./modules/zerotier.nix #./modules/headscale.nix #./modules/wiregrill diff --git a/nixos/eve/modules/nixos-wiki/backup.nix b/nixos/eve/modules/nixos-wiki/backup.nix deleted file mode 100644 index a5aeb5837..000000000 --- a/nixos/eve/modules/nixos-wiki/backup.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ config, pkgs, ... }: -let - wikiDump = "/var/backup/wikidump.xml.gz"; - - mediawiki-maintenance = pkgs.runCommand "mediawiki-maintenance" - { - nativeBuildInputs = [ pkgs.makeWrapper ]; - preferLocalBuild = true; - } '' - mkdir -p $out/bin - makeWrapper ${pkgs.php}/bin/php $out/bin/mediawiki-maintenance \ - --set MEDIAWIKI_CONFIG ${config.services.phpfpm.pools.mediawiki.phpEnv.MEDIAWIKI_CONFIG} \ - --add-flags ${config.services.mediawiki.finalPackage}/share/mediawiki/maintenance/run.php - ''; - - wiki-restore = pkgs.writeShellApplication { - name = "wiki-restore"; - runtimeInputs = [ - pkgs.postgresql - pkgs.coreutils - pkgs.util-linux - mediawiki-maintenance - ]; - text = '' - tmpdir=$(mktemp -d) - cleanup() { rm -rf "$tmpdir"; } - cd "$tmpdir" - chown mediawiki:nginx "$tmpdir" - - rm -rf /var/lib/mediawiki-uploads - install -d -m 755 -o mediawiki -g nginx /var/lib/mediawiki-uploads - systemctl stop phpfpm-mediawiki.service - runuser -u postgres -- dropdb mediawiki - systemctl restart postgresql - systemctl restart mediawiki-init.service - cat < tags - extensions.ParserFunctions = null; - extensions.Cite = null; - extensions.VisualEditor = null; - extensions.AuthManagerOAuth = pkgs.fetchzip { - url = "https://github.com/mohe2015/AuthManagerOAuth/releases/download/v0.3.0/AuthManagerOAuth.zip"; - hash = "sha256-4ev8LwuConmHzFm5cPr+ni9aYPDOHLArGoJhzdugEn4="; - }; # Github login - extensions.ConfirmEdit = null; # Combat SPAM with a simple Captcha - extensions.StopForumSpam = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/StopForumSpam-REL1_40-71b57ba.tar.gz"; - hash = "sha256-g8v4zr11c2e4bY0BNipJ48miyAF4WTNvlSMgb/NxPBA="; - }; - - extraConfig = '' - #$wgDebugLogFile = "/var/log/mediawiki/debug.log"; - - # allow local login - $wgAuthManagerOAuthConfig = [ - 'github' => [ - 'clientId' => '${githubClientId}', - 'clientSecret' => file_get_contents("${config.sops.secrets.nixos-wiki-github-client-secret.path}"), - 'urlAuthorize' => 'https://github.com/login/oauth/authorize', - 'urlAccessToken' => 'https://github.com/login/oauth/access_token', - 'urlResourceOwnerDetails' => 'https://api.github.com/user' - ], - ]; - - # Enable account creation globally - $wgGroupPermissions['*']['createaccount'] = true; - $wgGroupPermissions['*']['autocreateaccount'] = true; - - # Disable anonymous editing - $wgGroupPermissions['*']['edit'] = false; - - # Allow svg upload - $wgFileExtensions[] = 'svg'; - $wgSVGConverterPath = "${pkgs.imagemagick}/bin"; - - # Pretty URLs - $wgUsePathInfo = true; - - # cache pages with APCu - $wgMainCacheType = CACHE_ACCEL; - - # TODO: nixos favicon - #$wgFavicon = "/favicon.ico"; - $wgDefaultSkin = 'vector-2022'; - # configure logos for vector-2022: https://www.mediawiki.org/wiki/Manual:$wgLogos - $wgLogos = [ - '1x' => '/nixos.png', - 'icon' => '/nixos.png', - ]; - - # Combat SPAM with IP-Blocklists (StopForumSpam extension) - $wgEnableDnsBlacklist = true; - $wgDnsBlacklistUrls = array( - 'dnsbl.dronebl.org' - ); - - # required for fancy VisualEditor extension - $wgGroupPermissions['user']['writeapi'] = true; - - # Enable content security policy - $wgCSPHeader = true; - - # Disallow framing - $wgEditPageFrameOptions = "DENY"; - - $wgEnableEmail = true; - $wgAllowHTMLEmail = false; - $wgEmergencyContact = "nixos-wiki-emergency@thalheim.io"; - $wgPasswordSender = "nixos-wiki@thalheim.io"; # Default FROM address - $wgNoReplyAddress = "nixos-wiki-no-reply@thalheim.io"; # Default Reply-To address - ''; - }; - + services.nixos-wiki.hostname = "nixos-wiki.thalheim.io"; + services.nixos-wiki.githubClientId = "Iv1.95ed182c83df1d22"; services.nginx.virtualHosts.${config.services.mediawiki.nginx.hostName} = { + enableACME = lib.mkForce false; useACMEHost = "thalheim.io"; - forceSSL = true; - locations."=/nixos.png".alias = ./nixos.png; }; } diff --git a/nixos/eve/modules/nixos-wiki/nixos.png b/nixos/eve/modules/nixos-wiki/nixos.png deleted file mode 100644 index 6867428956ac01b88526e65d2a9d0aca3d59b215..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6093 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 Date: Tue, 24 Oct 2023 22:26:17 +0200 Subject: [PATCH 2/4] drop squid-ldap --- sops/secrets/squid-ldap/groups/admins | 1 - sops/secrets/squid-ldap/machines/eve | 1 - sops/secrets/squid-ldap/secret | 24 ------------------------ 3 files changed, 26 deletions(-) delete mode 120000 sops/secrets/squid-ldap/groups/admins delete mode 120000 sops/secrets/squid-ldap/machines/eve delete mode 100644 sops/secrets/squid-ldap/secret diff --git a/sops/secrets/squid-ldap/groups/admins b/sops/secrets/squid-ldap/groups/admins deleted file mode 120000 index e5092e314..000000000 --- a/sops/secrets/squid-ldap/groups/admins +++ /dev/null @@ -1 +0,0 @@ -../../../groups/admins \ No newline at end of file diff --git a/sops/secrets/squid-ldap/machines/eve b/sops/secrets/squid-ldap/machines/eve deleted file mode 120000 index 1ef92aca2..000000000 --- a/sops/secrets/squid-ldap/machines/eve +++ /dev/null @@ -1 +0,0 @@ -../../../machines/eve \ No newline at end of file diff --git a/sops/secrets/squid-ldap/secret b/sops/secrets/squid-ldap/secret deleted file mode 100644 index 14a48ce2e..000000000 --- a/sops/secrets/squid-ldap/secret +++ /dev/null @@ -1,24 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:UxtBWYHlgT058NUwNtQNQ08/vKDMmDu8NshovhQIz4I=,iv:AbVqTM9xg4kR+3b8MtvfDklFzNs9phq+hcaL5YYHyG0=,tag:FUoxiavTzs3uccgCeBOhiA==,type:str]", - "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, - "age": [ - { - "recipient": "age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBScG9oS3ltbFNoazFrY3Fv\nRmNkdUF4TUlQenJ2SENzWE11RGpSQmhYZ1JJClpQWEIvLy9XWStMOUlRQlcwUzhl\nQktQeDN1ekI5VXFRcWNwcDRHbFcyR1kKLS0tIGJGM1piVmExVUU3Y0xFckE1MGUv\nSGY4UkxDMEdha3d3Sk8zeEJpTzgxZmsKFZLRmw36FgHLQCQ1PISMdv3UR8AIMZJB\n/VeSRiVFsg4sXuXrHCedrQ6MTYKmBtDonJ/fuwsUuRXXHCCgT/kGXA==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age1hjm3aujg9e79f5yth8a2cejzdjg5n9vnu96l05p70uvfpeltnpms7yy3pp", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0b2NpYThqOS9tRnVBRkVC\nTjk5Mm1oVFIzaHNoZGVaS2VLVXFIb09NbWg4Cjc2QTZ6TVNpNW5SbXBKZ3RYbHd3\nYXZYQmkzV25PK1daNEpJL1hKTVM5SnMKLS0tIEZzTk1aU0ZLMjFGTmJhQzBhZXFN\nT0d0eGZMRk83c1BqOXpqMWZKRnN5M2sKSWJMwzpieYE9gepDILPA0+sBfpD2krx0\nUSXBpjAB+eRm+Mj3ip5GINJzXDwe8Vzk05oMtDLpOa3MyhvffXCJAA==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2023-09-03T06:35:02Z", - "mac": "ENC[AES256_GCM,data:IzHdMQHY7HrohEW9WuLadSVZFGoeyUQwPvK37vnD/j6blnpeW/JenHxJSndYrhiEKm0/QCNu+7B7nol0yiRcXRsX/pLuRRu/tO5PgbyG4Vnjyn2dPOe6bLH2F/XI+bF5j+5y1Lagc924JEgrkxsy8+vwScIS8EDq78OrJ4nwZV0=,iv:7eDfQDBV1I6gDN/ZNfqWgsqdkld1FPvD580IyVLils0=,tag:LKJyZiDRPMEK5qWMOhbBrw==,type:str]", - "pgp": null, - "unencrypted_suffix": "_unencrypted", - "version": "3.7.3" - } -} \ No newline at end of file From c8987415b5510ce977136ac51c4e2a844c8624bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 24 Oct 2023 22:26:25 +0200 Subject: [PATCH 3/4] qtile: setup rofi --- home/.config/qtile/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/qtile/config.py b/home/.config/qtile/config.py index fb9b8ee3d..e9e8f6903 100644 --- a/home/.config/qtile/config.py +++ b/home/.config/qtile/config.py @@ -113,7 +113,7 @@ def create_screenshot(qtile: Qtile) -> None: ), Key([mod, "control"], "r", lazy.reload_config(), desc="Reload the config"), Key([mod, "control"], "q", lazy.shutdown(), desc="Shutdown Qtile"), - Key([mod], "r", lazy.spawncmd(), desc="Spawn a command using a prompt widget"), + Key([mod], "r", lazy.spawn("rofi -show run"), desc="Spawn rofi"), Key( [mod], "Print", From dc5ca6fd8fef4b4bce7d5512436f3eea41a5d5c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Oct 2023 07:46:10 +0200 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'buildbot-nix': 'github:Mic92/buildbot-nix/a78f6f9a01e2fe3ab51116f662a2bbb7ed77fd92' (2023-10-19) → 'github:Mic92/buildbot-nix/4f531d50f8558cdb8567af7a6becaca7893bf413' (2023-10-27) flake.lock: Update Flake lock file updates: • Updated input 'buildbot-nix': 'github:Mic92/buildbot-nix/9e760858b4a23b685d0edec2ba951cb91beb474b' (2023-10-27) → 'github:Mic92/buildbot-nix/3f9c267521ca2be31b87073e33df533793f9b21e' (2023-10-27) flake.lock: Update Flake lock file updates: • Updated input 'buildbot-nix': 'github:Mic92/buildbot-nix/3f9c267521ca2be31b87073e33df533793f9b21e' (2023-10-27) → 'github:Mic92/buildbot-nix/3e4964c4ccd0bf19448ff051c7db4c8b3f12194b' (2023-10-27) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0d2083c04..2812d1ba2 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1697710816, - "narHash": "sha256-H03eOegMFtZEhaT0x75LBgZ3d5chEO2psAWJSf0gVCk=", + "lastModified": 1698388014, + "narHash": "sha256-YAZM28dB0hzeJUYKjMxAvfMx41yLgiSzZT1BDl1cBKE=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "a78f6f9a01e2fe3ab51116f662a2bbb7ed77fd92", + "rev": "3e4964c4ccd0bf19448ff051c7db4c8b3f12194b", "type": "github" }, "original": { @@ -482,11 +482,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1698134225, - "narHash": "sha256-oeWaAcAgDlSf3Ga0QsRj7tt+CILEVmECuW555jr7hYo=", + "lastModified": 1698385460, + "narHash": "sha256-Ev9rNZMu5HJUqJ/bqYSHfb/Cq+FVLHEoFZ0sk5TdXUg=", "owner": "Mic92", "repo": "nixpkgs", - "rev": "e689648b04f1295cec4fb57979bedb2201ca4a0a", + "rev": "aba21eae776972efd9e3ce460890621e0673751f", "type": "github" }, "original": {