move server to server directory.

2024-07-24 14:40:50 +12:00 · 2024-06-23 17:48:14 +02:00 · 2024-06-23 17:48:14 +02:00 · 5b98344205
commit 5b98344205
parent da45f62ca8
211 changed files with 18 additions and 10 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -4,7 +4,7 @@
 	"name": "Go",
 	"build": {
 		"dockerfile": "Dockerfile",
-		"context": "../",
+		"context": "../server/",
 		"args": {
 			// Update the VARIANT arg to pick a version of Go: 1, 1.16, 1.15
 			"VARIANT": "1.20",
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,3 @@
-bin/
-.idea
-.env.development
-
 runtime/fonts/*
 !runtime/fonts/.gitkeep

--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -10,11 +10,11 @@
            "debugAdapter": "dlv-dap",
            "request": "launch",
            "mode": "debug",
-            "program": "${workspaceFolder}/cmd/neko",
-            "output": "${workspaceFolder}/bin/debug/neko",
-            "cwd": "${workspaceFolder}/",
+            "program": "${workspaceFolder}/server/cmd/neko",
+            "output": "${workspaceFolder}/server/bin/debug/neko",
+            "cwd": "${workspaceFolder}/server/",
            "args": ["serve", "-d", "-c", "dev/runtime/config.yml"],
-            "envFile": "${workspaceFolder}/.env.development"
+            "envFile": "${workspaceFolder}/server/.env.development"
        }
    ]
 }
--- a/2
+++ b/2
@ -186,7 +186,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright 2020 Nurdism <nurdism.io@gmail.com>, 2020-2022 m1k1o & Demodesk GmbH
+   Copyright 2020 Nurdism <nurdism.io@gmail.com>, 2020- https://github.com/m1k1o

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/server/.gitignore
+++ b/server/.gitignore
@ -0,0 +1,12 @@
+bin/
+.idea
+.env.development
+
+runtime/fonts/*
+!runtime/fonts/.gitkeep
+
+runtime/icon-theme/*
+!runtime/icon-theme/.gitkeep
+
+plugins/*
+!plugins/.gitkeep
--- a/server/Dockerfile
+++ b/server/Dockerfile
--- a/server/Dockerfile.bookworm
+++ b/server/Dockerfile.bookworm
--- a/server/Dockerfile.nvidia
+++ b/server/Dockerfile.nvidia
--- a/server/Dockerfile.nvidia.bookworm
+++ b/server/Dockerfile.nvidia.bookworm
--- a/server/build
+++ b/server/build
--- a/server/cmd/neko/main.go
+++ b/server/cmd/neko/main.go
--- a/server/cmd/plugins.go
+++ b/server/cmd/plugins.go
--- a/server/cmd/root.go
+++ b/server/cmd/root.go
--- a/server/cmd/serve.go
+++ b/server/cmd/serve.go
--- a/server/dev/build
+++ b/server/dev/build
--- a/server/dev/exec
+++ b/server/dev/exec
--- a/server/dev/fmt
+++ b/server/dev/fmt
--- a/server/dev/go
+++ b/server/dev/go
--- a/server/dev/lint
+++ b/server/dev/lint
--- a/server/dev/rebuild
+++ b/server/dev/rebuild
--- a/server/dev/rebuild.input
+++ b/server/dev/rebuild.input
--- a/server/dev/runtime/Dockerfile
+++ b/server/dev/runtime/Dockerfile
--- a/server/dev/runtime/config.nvidia.yml
+++ b/server/dev/runtime/config.nvidia.yml
--- a/server/dev/runtime/config.yml
+++ b/server/dev/runtime/config.yml
--- a/server/dev/runtime/supervisord.conf
+++ b/server/dev/runtime/supervisord.conf
--- a/server/dev/start
+++ b/server/dev/start
--- a/server/go.mod
+++ b/server/go.mod
--- a/server/go.sum
+++ b/server/go.sum
--- a/server/internal/api/members/bluk.go
+++ b/server/internal/api/members/bluk.go
--- a/server/internal/api/members/controler.go
+++ b/server/internal/api/members/controler.go
--- a/server/internal/api/members/handler.go
+++ b/server/internal/api/members/handler.go
--- a/server/internal/api/room/broadcast.go
+++ b/server/internal/api/room/broadcast.go
--- a/server/internal/api/room/clipboard.go
+++ b/server/internal/api/room/clipboard.go
--- a/server/internal/api/room/control.go
+++ b/server/internal/api/room/control.go
--- a/server/internal/api/room/handler.go
+++ b/server/internal/api/room/handler.go
--- a/server/internal/api/room/keyboard.go
+++ b/server/internal/api/room/keyboard.go
--- a/server/internal/api/room/screen.go
+++ b/server/internal/api/room/screen.go
--- a/server/internal/api/room/settings.go
+++ b/server/internal/api/room/settings.go
--- a/server/internal/api/room/upload.go
+++ b/server/internal/api/room/upload.go
--- a/server/internal/api/router.go
+++ b/server/internal/api/router.go
--- a/server/internal/api/session.go
+++ b/server/internal/api/session.go
--- a/server/internal/api/sessions/controller.go
+++ b/server/internal/api/sessions/controller.go
--- a/server/internal/api/sessions/handler.go
+++ b/server/internal/api/sessions/handler.go
--- a/server/internal/capture/broadcast.go
+++ b/server/internal/capture/broadcast.go
--- a/server/internal/capture/manager.go
+++ b/server/internal/capture/manager.go
--- a/server/internal/capture/screencast.go
+++ b/server/internal/capture/screencast.go
--- a/server/internal/capture/streamselector.go
+++ b/server/internal/capture/streamselector.go
--- a/server/internal/capture/streamsink.go
+++ b/server/internal/capture/streamsink.go
--- a/server/internal/capture/streamsrc.go
+++ b/server/internal/capture/streamsrc.go
--- a/server/internal/config/capture.go
+++ b/server/internal/config/capture.go
--- a/server/internal/config/config.go
+++ b/server/internal/config/config.go
--- a/server/internal/config/desktop.go
+++ b/server/internal/config/desktop.go
--- a/server/internal/config/member.go
+++ b/server/internal/config/member.go
--- a/server/internal/config/plugins.go
+++ b/server/internal/config/plugins.go
--- a/server/internal/config/root.go
+++ b/server/internal/config/root.go
--- a/server/internal/config/server.go
+++ b/server/internal/config/server.go
--- a/server/internal/config/session.go
+++ b/server/internal/config/session.go
--- a/server/internal/config/webrtc.go
+++ b/server/internal/config/webrtc.go
--- a/server/internal/desktop/clipboard.go
+++ b/server/internal/desktop/clipboard.go
--- a/server/internal/desktop/drop.go
+++ b/server/internal/desktop/drop.go
--- a/server/internal/desktop/filechooserdialog.go
+++ b/server/internal/desktop/filechooserdialog.go
--- a/server/internal/desktop/manager.go
+++ b/server/internal/desktop/manager.go
--- a/server/internal/desktop/xevent.go
+++ b/server/internal/desktop/xevent.go
--- a/server/internal/desktop/xinput.go
+++ b/server/internal/desktop/xinput.go
--- a/server/internal/desktop/xorg.go
+++ b/server/internal/desktop/xorg.go
--- a/server/internal/http/batch.go
+++ b/server/internal/http/batch.go
--- a/server/internal/http/debug.go
+++ b/server/internal/http/debug.go
--- a/server/internal/http/logger.go
+++ b/server/internal/http/logger.go
--- a/server/internal/http/manager.go
+++ b/server/internal/http/manager.go
--- a/server/internal/http/router.go
+++ b/server/internal/http/router.go
--- a/server/internal/member/file/provider.go
+++ b/server/internal/member/file/provider.go
--- a/server/internal/member/file/provider_test.go
+++ b/server/internal/member/file/provider_test.go
--- a/server/internal/member/file/types.go
+++ b/server/internal/member/file/types.go
--- a/server/internal/member/manager.go
+++ b/server/internal/member/manager.go
--- a/server/internal/member/multiuser/provider.go
+++ b/server/internal/member/multiuser/provider.go
--- a/server/internal/member/multiuser/types.go
+++ b/server/internal/member/multiuser/types.go
--- a/server/internal/member/noauth/provider.go
+++ b/server/internal/member/noauth/provider.go
--- a/server/internal/member/object/provider.go
+++ b/server/internal/member/object/provider.go
--- a/server/internal/member/object/types.go
+++ b/server/internal/member/object/types.go
--- a/server/internal/plugins/chat/config.go
+++ b/server/internal/plugins/chat/config.go
--- a/server/internal/plugins/chat/manager.go
+++ b/server/internal/plugins/chat/manager.go
--- a/server/internal/plugins/chat/plugin.go
+++ b/server/internal/plugins/chat/plugin.go
--- a/server/internal/plugins/chat/types.go
+++ b/server/internal/plugins/chat/types.go
--- a/server/internal/plugins/dependency.go
+++ b/server/internal/plugins/dependency.go
--- a/server/internal/plugins/dependency_test.go
+++ b/server/internal/plugins/dependency_test.go
--- a/server/internal/plugins/filetransfer/config.go
+++ b/server/internal/plugins/filetransfer/config.go
--- a/server/internal/plugins/filetransfer/manager.go
+++ b/server/internal/plugins/filetransfer/manager.go
--- a/server/internal/plugins/filetransfer/plugin.go
+++ b/server/internal/plugins/filetransfer/plugin.go
--- a/server/internal/plugins/filetransfer/types.go
+++ b/server/internal/plugins/filetransfer/types.go
--- a/server/internal/plugins/filetransfer/utils.go
+++ b/server/internal/plugins/filetransfer/utils.go
--- a/server/internal/plugins/manager.go
+++ b/server/internal/plugins/manager.go
--- a/server/internal/session/auth.go
+++ b/server/internal/session/auth.go
--- a/server/internal/session/manager.go
+++ b/server/internal/session/manager.go
--- a/server/internal/session/serialize.go
+++ b/server/internal/session/serialize.go
--- a/server/internal/session/session.go
+++ b/server/internal/session/session.go
--- a/server/internal/webrtc/cursor/image.go
+++ b/server/internal/webrtc/cursor/image.go
--- a/server/internal/webrtc/cursor/position.go
+++ b/server/internal/webrtc/cursor/position.go
--- a/server/internal/webrtc/handler.go
+++ b/server/internal/webrtc/handler.go
--- a/server/internal/webrtc/manager.go
+++ b/server/internal/webrtc/manager.go
--- a/server/internal/webrtc/metrics.go
+++ b/server/internal/webrtc/metrics.go
--- a/Show More
+++ b/Show More