modules/servers/nextcloud.nix

@@ -38,7 +38,7 @@ let
 in
 {
   options.my.servers = {
-    nextcloud = setup.mkOptions "nextcloud" "cloud" 80;
+    nextcloud = setup.mkOptions "nextcloud" "cloud" 8081;
     collabora = setup.mkOptions "collabora" "collabora" 9980;
     go-vod.enable = lib.mkEnableOption "Go-VOD video transcoding service";
   };
@@ -68,8 +68,7 @@ in
             ;
         };
       };
-      services = {
-        nextcloud = {
+      services.nextcloud = {
         enable = true;
         https = false; # vps
         package = pkgs.nextcloud32;
@@ -162,22 +161,7 @@ in
           all.pdlib
           all.bz2
         ];
-        };
-        nginx.virtualHosts.${cfg.host} = {
-          forceSSL = false;
-          enableACME = false;
-          http2 = false;
-          listen = [
-            {
-              addr = config.my.ips.wg-server;
-              port = 8081;
-            }
-            {
-              addr = config.my.localhost;
-              port = 8081;
-            }
-          ];
-        };
+
       };
       virtualisation.oci-containers.containers = {
         go-vod = lib.mkIf config.my.servers.go-vod.enable {
@@ -254,10 +238,10 @@ in
       my.servers.nextcloud.useDefaultProxy = false;
       services.nginx.virtualHosts = {
         "${cfg.host}" = {
-          forceSSL = true;
-          enableACME = true;
-          http2 = true;
-          default = true;
+          forceSSL = false;
+          enableACME = false;
+          http2 = false;
+          default = false;
           serverAliases = [ "cloud.rotehaare.art" ];
           extraConfig = ''
             add_header X-XSS-Protection "1; mode=block" always;
@@ -272,11 +256,6 @@ in
             "~ ^/nextcloud/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+|.+/richdocumentscode/proxy).php(?:$|/)" =
               { };
           };
-        }
-        // lib.optionalAttrs cfg.enable {
-          forceSSL = false;
-          enableACME = false;
-          http2 = false;
           listen = [
             {
               addr = config.my.ips.wg-server;