From 1f461e48e92cf815ac26f89cc80a1b123128928c Mon Sep 17 00:00:00 2001 From: Silas Schöffel Date: Wed, 24 Apr 2024 09:40:35 +0200 Subject: fix(treewide): move former git-crypted files to correct location They were accidentally added at the wrong location in dd4b6bcfc16c7c795b697195eb6703966352d9f4 --- services/mail/users.nix | 48 ---------------------------- services/nginx/hosts.nix | 12 ------- services/taskserver/organisations.nix | 14 -------- system/services/mail/users.nix | 48 ++++++++++++++++++++++++++++ system/services/nginx/hosts.nix | 12 +++++++ system/services/taskserver/organisations.nix | 14 ++++++++ 6 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 services/mail/users.nix delete mode 100644 services/nginx/hosts.nix delete mode 100644 services/taskserver/organisations.nix create mode 100644 system/services/mail/users.nix create mode 100644 system/services/nginx/hosts.nix create mode 100644 system/services/taskserver/organisations.nix diff --git a/services/mail/users.nix b/services/mail/users.nix deleted file mode 100644 index eb9c714..0000000 --- a/services/mail/users.nix +++ /dev/null @@ -1,48 +0,0 @@ -{...}: { - domains = [ - "vhack.eu" - - "s-schoeffel.de" - "b-peetz.de" - - "sils.li" - "nightingale.sils.li" - "sils.sils.li" - ]; - - loginAccounts = { - "sils@vhack.eu" = { - hashedPassword = "$2b$05$RW/Svgk7iGxvP5W7ZwUZ1e.a3fj4fteevb2MtfFYYD0d1DQ17y9Fm"; - }; - "soispha@vhack.eu" = { - hashedPassword = "$2b$05$XX36sJuHNbTFvi8DFldscOeQBHahluSkiUqD9QGzQaET7NJusSuQW"; - }; - - "benedikt.peetz@b-peetz.de" = { - hashedPassword = "$2b$05$MfET8utot2OolPZNASqoDe4VXNoG2chnEWhdfQ2E92mit0TvI2gBy"; - aliases = ["@b-peetz.de"]; - }; - "silas.schoeffel@s-schoeffel.de" = { - hashedPassword = "$2b$05$Qb8rl7ncpCcTbsSdsduJBuOITp8RTD6sfOTjuxJsVtD9vjAYY9n8e"; - aliases = ["@s-schoeffel.de"]; - }; - - "nightingale@vhack.eu" = { - hashedPassword = "$2b$05$nDKVVq1EktKXWqGFhnOLP.plLovXFyvWSuptK9GIkxA5DScKFx6YS"; - aliases = [ - "@nightingale.sils.li" - ]; - }; - "sils@sils.li" = { - hashedPassword = "$2b$05$Ebzh2ZhuWkz1p4tqJ172IejNZg10FtCxPDY4k6umYrpirXg7ezIRq"; - aliases = [ - "@sils.sils.li" - "@sils.li" - ]; - }; - # Mail-Account used by hosted software - "mastodon@vhack.eu" = { - hashedPassword = "$2b$05$pSby3x2p3cHg0FyAE8IiJ.nYUqtAIR10JA8HNpHwMAiLXqc.ltSK."; - }; - }; -} diff --git a/services/nginx/hosts.nix b/services/nginx/hosts.nix deleted file mode 100644 index 5d27af7..0000000 --- a/services/nginx/hosts.nix +++ /dev/null @@ -1,12 +0,0 @@ -{...}: [ - { - domain = "vhack.eu"; - root = "/etc/nginx/websites/vhack.eu"; - url = "https://codeberg.org/vhack.eu/website.git"; - } - { - domain = "b-peetz.de"; - root = "/etc/nginx/websites/b-peetz.de"; - url = "https://codeberg.org/bpeetz/b-peetz.de.git"; - } -] diff --git a/services/taskserver/organisations.nix b/services/taskserver/organisations.nix deleted file mode 100644 index c3ad966..0000000 --- a/services/taskserver/organisations.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - vhack = { - users = [ - "soispha" - ]; - }; - soispha = { - users = [ - "soispha" - "android-mobile" - "android-tab" - ]; - }; -} diff --git a/system/services/mail/users.nix b/system/services/mail/users.nix new file mode 100644 index 0000000..eb9c714 --- /dev/null +++ b/system/services/mail/users.nix @@ -0,0 +1,48 @@ +{...}: { + domains = [ + "vhack.eu" + + "s-schoeffel.de" + "b-peetz.de" + + "sils.li" + "nightingale.sils.li" + "sils.sils.li" + ]; + + loginAccounts = { + "sils@vhack.eu" = { + hashedPassword = "$2b$05$RW/Svgk7iGxvP5W7ZwUZ1e.a3fj4fteevb2MtfFYYD0d1DQ17y9Fm"; + }; + "soispha@vhack.eu" = { + hashedPassword = "$2b$05$XX36sJuHNbTFvi8DFldscOeQBHahluSkiUqD9QGzQaET7NJusSuQW"; + }; + + "benedikt.peetz@b-peetz.de" = { + hashedPassword = "$2b$05$MfET8utot2OolPZNASqoDe4VXNoG2chnEWhdfQ2E92mit0TvI2gBy"; + aliases = ["@b-peetz.de"]; + }; + "silas.schoeffel@s-schoeffel.de" = { + hashedPassword = "$2b$05$Qb8rl7ncpCcTbsSdsduJBuOITp8RTD6sfOTjuxJsVtD9vjAYY9n8e"; + aliases = ["@s-schoeffel.de"]; + }; + + "nightingale@vhack.eu" = { + hashedPassword = "$2b$05$nDKVVq1EktKXWqGFhnOLP.plLovXFyvWSuptK9GIkxA5DScKFx6YS"; + aliases = [ + "@nightingale.sils.li" + ]; + }; + "sils@sils.li" = { + hashedPassword = "$2b$05$Ebzh2ZhuWkz1p4tqJ172IejNZg10FtCxPDY4k6umYrpirXg7ezIRq"; + aliases = [ + "@sils.sils.li" + "@sils.li" + ]; + }; + # Mail-Account used by hosted software + "mastodon@vhack.eu" = { + hashedPassword = "$2b$05$pSby3x2p3cHg0FyAE8IiJ.nYUqtAIR10JA8HNpHwMAiLXqc.ltSK."; + }; + }; +} diff --git a/system/services/nginx/hosts.nix b/system/services/nginx/hosts.nix new file mode 100644 index 0000000..5d27af7 --- /dev/null +++ b/system/services/nginx/hosts.nix @@ -0,0 +1,12 @@ +{...}: [ + { + domain = "vhack.eu"; + root = "/etc/nginx/websites/vhack.eu"; + url = "https://codeberg.org/vhack.eu/website.git"; + } + { + domain = "b-peetz.de"; + root = "/etc/nginx/websites/b-peetz.de"; + url = "https://codeberg.org/bpeetz/b-peetz.de.git"; + } +] diff --git a/system/services/taskserver/organisations.nix b/system/services/taskserver/organisations.nix new file mode 100644 index 0000000..c3ad966 --- /dev/null +++ b/system/services/taskserver/organisations.nix @@ -0,0 +1,14 @@ +{ + vhack = { + users = [ + "soispha" + ]; + }; + soispha = { + users = [ + "soispha" + "android-mobile" + "android-tab" + ]; + }; +} -- cgit 1.4.1