diff --git a/machines/compute01/_configuration.nix b/machines/compute01/_configuration.nix index 3400c06..5736309 100644 --- a/machines/compute01/_configuration.nix +++ b/machines/compute01/_configuration.nix @@ -15,7 +15,6 @@ lib.extra.mkConfig { "kanidm" "mastodon" "nextcloud" - "onlyoffice" "outline" "rstudio-server" "satosa" diff --git a/machines/compute01/onlyoffice/default.nix b/machines/compute01/onlyoffice/default.nix deleted file mode 100644 index fbce510..0000000 --- a/machines/compute01/onlyoffice/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, ... }: - -let hostname = "documentserver.dgnum.eu"; -in { - services.onlyoffice = { - inherit hostname; - - enable = true; - - jwtSecretFile = config.age.secrets."onlyoffice-jwt_secret_file".path; - - port = 8015; - }; - - services.nginx.virtualHosts.${hostname} = { - enableACME = true; - forceSSL = true; - }; - - dgn-secrets.matches."^onlyoffice-.*$" = { owner = "onlyoffice"; }; -} diff --git a/machines/compute01/secrets/onlyoffice-jwt_secret_file b/machines/compute01/secrets/onlyoffice-jwt_secret_file deleted file mode 100644 index a3136e6..0000000 --- a/machines/compute01/secrets/onlyoffice-jwt_secret_file +++ /dev/null @@ -1,27 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 tDqJRg 9KClo50ZWR0uxGXomkq/qiMAIqmUwZs5zAQB7NP2EQ0 -OLPsgWRhboDtx3w4tSngC6iawgwwsobxH3f1XX0GmaU --> ssh-ed25519 jIXfPA cwCh2qALAh+KR0a78CA9SL5BtbCj/D2iwv2L6wlIozE -fgEzTTGl1hOroJJrTNQG2vdKNv2gtzfbPnIV9094fg4 --> ssh-ed25519 QlRB9Q GdXj5z0EnEsK3sZjx7AecFjBaS8QxNwUOXPOy7XHXk4 -pAw0G7tI2kzs53eNFWUcGXI2Hs5HiyhdNDX91a2ovSg --> ssh-ed25519 r+nK/Q mXwufupz9IqeRPSxVJ9VajjeraMydZaDxbf43X3tUQ4 -UrUtXn4/xxD5rfF+5TJfU6XG+rt0ux76ytQKxGgTQww --> ssh-rsa krWCLQ -Z2YF/WRWx6R9iCD6yYBKd+qu0QEgU8zgns05zUV4ntz338FpzgqKXbEdBDlKhTg9 -3x1EZMwmCaHkKadIyNaK+DVu674dslf109qY2Z8Y2uyEuGXDiiKRCM5eMw0eCT7F -twzjOpo2Ap8dXHaiCz4FHXhTc2FnogPFbcg3G0J3APVyA0xL5T4D5iUN5ZAd6gbR -IdlETmPHBtJo6WvSUSTNA0XU2aSoFS6PF23nozZWBPvKw74+RGocPFDUzmBcTCrA -rajfmc4tmZR73amvcm+KwXK+TSeWb0s3PGeIe0ZhbNE8pxYlmhtTfj2xBgv1DIwD -3W7uOxv44DF/H5RxDoI4Vw --> ssh-ed25519 /vwQcQ O5sWA0Ju60oTSmxX418csot7EJ5Uop+3o+rly5/xZnQ -kdBCGvt2M2Jl2Jc/qP2n24mWv3gnBIZ1Zzz6CM7jYko --> ssh-ed25519 0R97PA kwgDZ+GHfUq45kahcIhFUw7UmT4/pJ+UjpNdp9n6yzE -2ophUut79+4+aje2geZsfZKijeo24Ag8Gx2vFHj4qT4 --> ssh-ed25519 JGx7Ng 3XWLXYKOWXpcAO54k/QA/Yvb6SsRsnvsRfiLuv+MRD4 -R8/GJ6Gd/Me19vIfhxVthcMrsF9kxTEcwZ9SoQjXvIY --> tT{}}-grease -xI7oAXcqMkDwMgGqRuVLbJi9FBF+F1COLvUyseMnHH4tFRm9e8YJ9LiLpfzt0oTp -p0Qjf1NLqvE5zishlqCwqCww3J+BrrfgGBPtOMiNGQU8Znk4LFFwxoc ---- P7IYBsTzUeccF3jqd+V3h3HaE/rXtZRNgrYNlQVKL0U -i/n!Oy|Ȑ&C뚪lW2-lNSXcRG} \ No newline at end of file diff --git a/machines/compute01/secrets/secrets.nix b/machines/compute01/secrets/secrets.nix index 6764df1..898e3cb 100644 --- a/machines/compute01/secrets/secrets.nix +++ b/machines/compute01/secrets/secrets.nix @@ -9,7 +9,6 @@ lib.setDefault { inherit publicKeys; } [ "mastodon-extra_env_file" "nextcloud-adminpass_file" "nextcloud-s3_secret_file" - "onlyoffice-jwt_secret_file" "outline-oidc_client_secret_file" "outline-smtp_password_file" "outline-storage_secret_key_file" diff --git a/patches/default.nix b/patches/default.nix index 39b2e6e..04d5862 100644 --- a/patches/default.nix +++ b/patches/default.nix @@ -128,18 +128,6 @@ path = ./castopod.patch; } - # onlyoffice-documentserver: 7.3.3 -> 7.4.0 - { - id = 238182; - hash = "sha256-HhdNPOOmQ62IYoG50ZGc0U/dUub2vIQ4fJR/gudoV2Y="; - } - - # onlyoffice-documentserver: 7.4.0 -> 7.4.1 - { - id = 252318; - hash = "sha256-lI5WYFlxKvava9e+eTI8ZGogIb3uPOLAWFrkxbSlCXI="; - } - # nixos/fail2ban: RFC42-ize { id = 201907;