From 4a8c665749612f2d60761620aa26ac78c80d74c7 Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Tue, 23 Apr 2024 23:20:44 +0200 Subject: [PATCH] Add 2324 RPG wiki --- modules/dokuwiki.nix | 27 +++++++++++++++++++++------ secrets.enc.yml | 8 +++++--- terraform/dns.tf | 9 +++++++++ 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/modules/dokuwiki.nix b/modules/dokuwiki.nix index d1ab539..b3f8d6a 100644 --- a/modules/dokuwiki.nix +++ b/modules/dokuwiki.nix @@ -12,7 +12,17 @@ let installPhase = "mkdir -p $out; cp -R * $out/"; }; - configureWiki = name: { + template-darkblue = pkgs.stdenv.mkDerivation { + name = "darkblue"; + src = builtins.fetchGit { + url = "git@github.com:ms101/dokuwiki-template-darkblue.git"; + ref = "main"; + rev = "14f8e738c83c16f2633d23fe30b7c6031551fa77"; + }; + installPhase = "mkdir -p $out; cp -R darkblue/* $out/"; + }; + + configureWiki = name: title: templatePackage: templateName: { sops.secrets."usersFile-${name}" = { owner = "dokuwiki"; @@ -26,11 +36,11 @@ let enable = true; stateDir = "/nix/var/data/dokuwiki/${name}/data"; usersFile = config.sops.secrets."usersFile-${name}".path; - templates = [ template-chippedsnow ]; + templates = [ templatePackage ]; settings = { useacl = true; - title = "Chroniques d`Arkadia"; - template = "chippedsnow"; + title = title; + template = templateName; disableactions = "register"; dontlog = [ "debug" "deprecated" ]; }; @@ -51,6 +61,11 @@ in { secretKeyFile = lib.mkOption { type = lib.types.path; }; }; - config = lib.mkIf cfg.enable - (lib.mkMerge [ (configureWiki "anderia") (configureWiki "arkadia") ]); + config = lib.mkIf cfg.enable (lib.mkMerge [ + (configureWiki "anderia" "Choniques d`Arkadia" template-chippedsnow + "chippedsnow") + (configureWiki "arkadia" "Choniques d`Arkadia" template-chippedsnow + "chippedsnow") + (configureWiki "scifirpg" "2324" template-darkblue "darkblue") + ]); } diff --git a/secrets.enc.yml b/secrets.enc.yml index e768f3b..62b300e 100644 --- a/secrets.enc.yml +++ b/secrets.enc.yml @@ -44,6 +44,8 @@ wiki: users_file: ENC[AES256_GCM,data:Zx5QTmtqqrRwbHUMiVFfvMnvzaLSlKiouOg57H+4RYS/5Zavl4y3Awswuiz9y7iRDGZhsxba6Ki3jEg/sSwlmB/hICQikQlRfsnx1ibAKeTv9A==,iv:R7vQBU/4thmBVcydHPNiwUOavkhl6OGEVL9WdexJzAw=,tag:FQ/9LjQ6c+ErAhH3erzOBQ==,type:str] arkadia: users_file: ENC[AES256_GCM,data:glllwv0+KnPOeJ4eFNXECZPZvL6k5RODxIJNfWjQgo8EUKF7UsVyRvHcL2g9TAEpXKT8RGLekZim+Q467eKKGPpdj2LlrI/XYPyMvk2ShaTBO2ivx+6e9zowpdJNclBMmtKGgggK+r7LeXGunCl06oq86LpKq9ddiX2zZnOfxU1b0ZAG+tmqSVfkgi7cOs5DGagSaco+2+SkCOGThahGquWMrPmVULO0Dz2w98+7uSbmFmXlJOOZjKCk/q0ou4Bi0gK6lQ8/fKleNJLJ0x8Vx0WPYZgz6109RkTYznMl2HSIZEcNp81PxQvr66Vumc8ZO+OXWbNyY064/LXFJB7sEA57r4ccHHkH5+FCKFQJzCA=,iv:Ki0MCTJ8jwogDNL71kiMY4EGrfBorxB2rpBJAid6QOQ=,tag:q/mfK3Dm0KFnK4AHjzsP7g==,type:str] + scifirpg: + users_file: ENC[AES256_GCM,data:bApVa1CJkHToft8LyO1rWSF4fEbOl+KIHUxFkiWxgzpaX9VuC3fnqGK1EVALktdIW4VkDlUgnNrRS/MY5orXzVasiYK4pzpKUxehCwcDaqB1qw==,iv:cQnMr/XGYsnDiK7ehRW/bPSKGvkxY4SAWvzrUOkuVSI=,tag:g/lmBp2ok6wkVYRkwW9A+w==,type:str] openvpn: credentials: ENC[AES256_GCM,data:AZRmAhGhqsCs650ExArM0nVX,iv:Y6vTMjIC5s4gIwDWgYfEOUPGScPpj4jhk4XYeyRjpUw=,tag:vkob+Q+Mv6O2GCFvY+adRw==,type:str] borg: @@ -67,8 +69,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2023-10-17T21:00:47Z" - mac: ENC[AES256_GCM,data:y7XPpUW7HpPM0gQ+ckdiLFRtiDXJNvt3MbUD+W0DpMEJbgIL/G1qgbyFopLcWlXPybLzzsbty6FaARq1ysmy4PXNH856W9OP3reSb0obn9BDseSB0KrLvwqJV9q8c3N1NUGKuwWKW60o3CJyVgIkAVINVu03jLANLjuq1LEmcOo=,iv:ZIvqRSElvp956gkoNSZPMi+SzhYrveLq/U+VzqV91+c=,tag:qnr1vfLHj74rSsG1w6nAWw==,type:str] + lastmodified: "2024-04-23T20:29:30Z" + mac: ENC[AES256_GCM,data:6CYH1MYnM9rIYM9L5ipd3Q3ypA8n/1BnnnnecBWaADevVYQ/p1TfxHJKKlOVP7PAOLs3B2gM4Prr1vqQSe8nYHd5FAWSyXtfhpqnMOlEoNHCPuLKjK3bE4TjbvCxP9RsJIwTE3evJAQGKreWRW8/ml5mGiwkhrdTEe+MSR/n138=,iv:jvPXJK8vomDgw8wcr2nn9GIjeGlPswRQo7RFHgOSZjs=,tag:VjKJkjmmNs04h0THbAEfUA==,type:str] pgp: - created_at: "2023-10-17T21:02:13Z" enc: | @@ -151,4 +153,4 @@ sops: -----END PGP MESSAGE----- fp: 7675e1c632a9a0644c6ab828dbcc48a5300773a8 unencrypted_suffix: _unencrypted - version: 3.7.3 + version: 3.8.1 diff --git a/terraform/dns.tf b/terraform/dns.tf index 848bdb5..624b182 100644 --- a/terraform/dns.tf +++ b/terraform/dns.tf @@ -183,6 +183,15 @@ resource "hetznerdns_record" "arkadia_a" { type = "A" ttl = 600 } + +resource "hetznerdns_record" "cifirpg_a" { + zone_id = data.hetznerdns_zone.banditlair_zone.id + name = "scifirpg" + value = hcloud_server.backend1.ipv4_address + type = "A" + ttl = 600 +} + resource "hetznerdns_record" "db1_a" { zone_id = data.hetznerdns_zone.banditlair_zone.id name = "db1"