diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml index fbf6548..e7d846d 100644 --- a/.github/workflows/nix.yaml +++ b/.github/workflows/nix.yaml @@ -17,7 +17,7 @@ jobs: github_access_token: ${{ secrets.GITHUB_TOKEN }} - name: "Basic CLI and web build" run: | - nix build .#tclip .#web + nix build .#tclip .#tclipd - name: "Docker image build" run: | nix build .#docker diff --git a/cmd/web/main.go b/cmd/tclipd/main.go similarity index 100% rename from cmd/web/main.go rename to cmd/tclipd/main.go diff --git a/cmd/web/schema.sql b/cmd/tclipd/schema.sql similarity index 100% rename from cmd/web/schema.sql rename to cmd/tclipd/schema.sql diff --git a/cmd/web/static/css/base.css b/cmd/tclipd/static/css/base.css similarity index 100% rename from cmd/web/static/css/base.css rename to cmd/tclipd/static/css/base.css diff --git a/cmd/web/static/css/font-files/Inter-Black.woff b/cmd/tclipd/static/css/font-files/Inter-Black.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-Black.woff rename to cmd/tclipd/static/css/font-files/Inter-Black.woff diff --git a/cmd/web/static/css/font-files/Inter-Black.woff2 b/cmd/tclipd/static/css/font-files/Inter-Black.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-Black.woff2 rename to cmd/tclipd/static/css/font-files/Inter-Black.woff2 diff --git a/cmd/web/static/css/font-files/Inter-BlackItalic.woff b/cmd/tclipd/static/css/font-files/Inter-BlackItalic.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-BlackItalic.woff rename to cmd/tclipd/static/css/font-files/Inter-BlackItalic.woff diff --git a/cmd/web/static/css/font-files/Inter-BlackItalic.woff2 b/cmd/tclipd/static/css/font-files/Inter-BlackItalic.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-BlackItalic.woff2 rename to cmd/tclipd/static/css/font-files/Inter-BlackItalic.woff2 diff --git a/cmd/web/static/css/font-files/Inter-Bold.woff b/cmd/tclipd/static/css/font-files/Inter-Bold.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-Bold.woff rename to cmd/tclipd/static/css/font-files/Inter-Bold.woff diff --git a/cmd/web/static/css/font-files/Inter-Bold.woff2 b/cmd/tclipd/static/css/font-files/Inter-Bold.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-Bold.woff2 rename to cmd/tclipd/static/css/font-files/Inter-Bold.woff2 diff --git a/cmd/web/static/css/font-files/Inter-BoldItalic.woff b/cmd/tclipd/static/css/font-files/Inter-BoldItalic.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-BoldItalic.woff rename to cmd/tclipd/static/css/font-files/Inter-BoldItalic.woff diff --git a/cmd/web/static/css/font-files/Inter-BoldItalic.woff2 b/cmd/tclipd/static/css/font-files/Inter-BoldItalic.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-BoldItalic.woff2 rename to cmd/tclipd/static/css/font-files/Inter-BoldItalic.woff2 diff --git a/cmd/web/static/css/font-files/Inter-ExtraBold.woff b/cmd/tclipd/static/css/font-files/Inter-ExtraBold.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-ExtraBold.woff rename to cmd/tclipd/static/css/font-files/Inter-ExtraBold.woff diff --git a/cmd/web/static/css/font-files/Inter-ExtraBold.woff2 b/cmd/tclipd/static/css/font-files/Inter-ExtraBold.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-ExtraBold.woff2 rename to cmd/tclipd/static/css/font-files/Inter-ExtraBold.woff2 diff --git a/cmd/web/static/css/font-files/Inter-ExtraBoldItalic.woff b/cmd/tclipd/static/css/font-files/Inter-ExtraBoldItalic.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-ExtraBoldItalic.woff rename to cmd/tclipd/static/css/font-files/Inter-ExtraBoldItalic.woff diff --git a/cmd/web/static/css/font-files/Inter-ExtraBoldItalic.woff2 b/cmd/tclipd/static/css/font-files/Inter-ExtraBoldItalic.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-ExtraBoldItalic.woff2 rename to cmd/tclipd/static/css/font-files/Inter-ExtraBoldItalic.woff2 diff --git a/cmd/web/static/css/font-files/Inter-ExtraLight.woff b/cmd/tclipd/static/css/font-files/Inter-ExtraLight.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-ExtraLight.woff rename to cmd/tclipd/static/css/font-files/Inter-ExtraLight.woff diff --git a/cmd/web/static/css/font-files/Inter-ExtraLight.woff2 b/cmd/tclipd/static/css/font-files/Inter-ExtraLight.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-ExtraLight.woff2 rename to cmd/tclipd/static/css/font-files/Inter-ExtraLight.woff2 diff --git a/cmd/web/static/css/font-files/Inter-ExtraLightItalic.woff b/cmd/tclipd/static/css/font-files/Inter-ExtraLightItalic.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-ExtraLightItalic.woff rename to cmd/tclipd/static/css/font-files/Inter-ExtraLightItalic.woff diff --git a/cmd/web/static/css/font-files/Inter-ExtraLightItalic.woff2 b/cmd/tclipd/static/css/font-files/Inter-ExtraLightItalic.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-ExtraLightItalic.woff2 rename to cmd/tclipd/static/css/font-files/Inter-ExtraLightItalic.woff2 diff --git a/cmd/web/static/css/font-files/Inter-Italic.woff b/cmd/tclipd/static/css/font-files/Inter-Italic.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-Italic.woff rename to cmd/tclipd/static/css/font-files/Inter-Italic.woff diff --git a/cmd/web/static/css/font-files/Inter-Italic.woff2 b/cmd/tclipd/static/css/font-files/Inter-Italic.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-Italic.woff2 rename to cmd/tclipd/static/css/font-files/Inter-Italic.woff2 diff --git a/cmd/web/static/css/font-files/Inter-Light.woff b/cmd/tclipd/static/css/font-files/Inter-Light.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-Light.woff rename to cmd/tclipd/static/css/font-files/Inter-Light.woff diff --git a/cmd/web/static/css/font-files/Inter-Light.woff2 b/cmd/tclipd/static/css/font-files/Inter-Light.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-Light.woff2 rename to cmd/tclipd/static/css/font-files/Inter-Light.woff2 diff --git a/cmd/web/static/css/font-files/Inter-LightItalic.woff b/cmd/tclipd/static/css/font-files/Inter-LightItalic.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-LightItalic.woff rename to cmd/tclipd/static/css/font-files/Inter-LightItalic.woff diff --git a/cmd/web/static/css/font-files/Inter-LightItalic.woff2 b/cmd/tclipd/static/css/font-files/Inter-LightItalic.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-LightItalic.woff2 rename to cmd/tclipd/static/css/font-files/Inter-LightItalic.woff2 diff --git a/cmd/web/static/css/font-files/Inter-Medium.woff b/cmd/tclipd/static/css/font-files/Inter-Medium.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-Medium.woff rename to cmd/tclipd/static/css/font-files/Inter-Medium.woff diff --git a/cmd/web/static/css/font-files/Inter-Medium.woff2 b/cmd/tclipd/static/css/font-files/Inter-Medium.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-Medium.woff2 rename to cmd/tclipd/static/css/font-files/Inter-Medium.woff2 diff --git a/cmd/web/static/css/font-files/Inter-MediumItalic.woff b/cmd/tclipd/static/css/font-files/Inter-MediumItalic.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-MediumItalic.woff rename to cmd/tclipd/static/css/font-files/Inter-MediumItalic.woff diff --git a/cmd/web/static/css/font-files/Inter-MediumItalic.woff2 b/cmd/tclipd/static/css/font-files/Inter-MediumItalic.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-MediumItalic.woff2 rename to cmd/tclipd/static/css/font-files/Inter-MediumItalic.woff2 diff --git a/cmd/web/static/css/font-files/Inter-Regular.woff b/cmd/tclipd/static/css/font-files/Inter-Regular.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-Regular.woff rename to cmd/tclipd/static/css/font-files/Inter-Regular.woff diff --git a/cmd/web/static/css/font-files/Inter-Regular.woff2 b/cmd/tclipd/static/css/font-files/Inter-Regular.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-Regular.woff2 rename to cmd/tclipd/static/css/font-files/Inter-Regular.woff2 diff --git a/cmd/web/static/css/font-files/Inter-SemiBold.woff b/cmd/tclipd/static/css/font-files/Inter-SemiBold.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-SemiBold.woff rename to cmd/tclipd/static/css/font-files/Inter-SemiBold.woff diff --git a/cmd/web/static/css/font-files/Inter-SemiBold.woff2 b/cmd/tclipd/static/css/font-files/Inter-SemiBold.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-SemiBold.woff2 rename to cmd/tclipd/static/css/font-files/Inter-SemiBold.woff2 diff --git a/cmd/web/static/css/font-files/Inter-SemiBoldItalic.woff b/cmd/tclipd/static/css/font-files/Inter-SemiBoldItalic.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-SemiBoldItalic.woff rename to cmd/tclipd/static/css/font-files/Inter-SemiBoldItalic.woff diff --git a/cmd/web/static/css/font-files/Inter-SemiBoldItalic.woff2 b/cmd/tclipd/static/css/font-files/Inter-SemiBoldItalic.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-SemiBoldItalic.woff2 rename to cmd/tclipd/static/css/font-files/Inter-SemiBoldItalic.woff2 diff --git a/cmd/web/static/css/font-files/Inter-Thin.woff b/cmd/tclipd/static/css/font-files/Inter-Thin.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-Thin.woff rename to cmd/tclipd/static/css/font-files/Inter-Thin.woff diff --git a/cmd/web/static/css/font-files/Inter-Thin.woff2 b/cmd/tclipd/static/css/font-files/Inter-Thin.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-Thin.woff2 rename to cmd/tclipd/static/css/font-files/Inter-Thin.woff2 diff --git a/cmd/web/static/css/font-files/Inter-ThinItalic.woff b/cmd/tclipd/static/css/font-files/Inter-ThinItalic.woff similarity index 100% rename from cmd/web/static/css/font-files/Inter-ThinItalic.woff rename to cmd/tclipd/static/css/font-files/Inter-ThinItalic.woff diff --git a/cmd/web/static/css/font-files/Inter-ThinItalic.woff2 b/cmd/tclipd/static/css/font-files/Inter-ThinItalic.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-ThinItalic.woff2 rename to cmd/tclipd/static/css/font-files/Inter-ThinItalic.woff2 diff --git a/cmd/web/static/css/font-files/Inter-italic.var.woff2 b/cmd/tclipd/static/css/font-files/Inter-italic.var.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-italic.var.woff2 rename to cmd/tclipd/static/css/font-files/Inter-italic.var.woff2 diff --git a/cmd/web/static/css/font-files/Inter-roman.var.woff2 b/cmd/tclipd/static/css/font-files/Inter-roman.var.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter-roman.var.woff2 rename to cmd/tclipd/static/css/font-files/Inter-roman.var.woff2 diff --git a/cmd/web/static/css/font-files/Inter.var.woff2 b/cmd/tclipd/static/css/font-files/Inter.var.woff2 similarity index 100% rename from cmd/web/static/css/font-files/Inter.var.woff2 rename to cmd/tclipd/static/css/font-files/Inter.var.woff2 diff --git a/cmd/web/static/css/font-files/LICENSE.txt b/cmd/tclipd/static/css/font-files/LICENSE.txt similarity index 100% rename from cmd/web/static/css/font-files/LICENSE.txt rename to cmd/tclipd/static/css/font-files/LICENSE.txt diff --git a/cmd/web/static/css/font-files/inter.css b/cmd/tclipd/static/css/font-files/inter.css similarity index 100% rename from cmd/web/static/css/font-files/inter.css rename to cmd/tclipd/static/css/font-files/inter.css diff --git a/cmd/web/static/css/normalize.css b/cmd/tclipd/static/css/normalize.css similarity index 100% rename from cmd/web/static/css/normalize.css rename to cmd/tclipd/static/css/normalize.css diff --git a/cmd/web/static/css/prism.css b/cmd/tclipd/static/css/prism.css similarity index 100% rename from cmd/web/static/css/prism.css rename to cmd/tclipd/static/css/prism.css diff --git a/cmd/web/static/js/prism.js b/cmd/tclipd/static/js/prism.js similarity index 100% rename from cmd/web/static/js/prism.js rename to cmd/tclipd/static/js/prism.js diff --git a/cmd/web/tmpl/base.html b/cmd/tclipd/tmpl/base.html similarity index 100% rename from cmd/web/tmpl/base.html rename to cmd/tclipd/tmpl/base.html diff --git a/cmd/web/tmpl/create.html b/cmd/tclipd/tmpl/create.html similarity index 100% rename from cmd/web/tmpl/create.html rename to cmd/tclipd/tmpl/create.html diff --git a/cmd/web/tmpl/error.html b/cmd/tclipd/tmpl/error.html similarity index 100% rename from cmd/web/tmpl/error.html rename to cmd/tclipd/tmpl/error.html diff --git a/cmd/web/tmpl/fancypost.html b/cmd/tclipd/tmpl/fancypost.html similarity index 100% rename from cmd/web/tmpl/fancypost.html rename to cmd/tclipd/tmpl/fancypost.html diff --git a/cmd/web/tmpl/help.html b/cmd/tclipd/tmpl/help.html similarity index 100% rename from cmd/web/tmpl/help.html rename to cmd/tclipd/tmpl/help.html diff --git a/cmd/web/tmpl/listpaste.html b/cmd/tclipd/tmpl/listpaste.html similarity index 100% rename from cmd/web/tmpl/listpaste.html rename to cmd/tclipd/tmpl/listpaste.html diff --git a/cmd/web/tmpl/nopastes.html b/cmd/tclipd/tmpl/nopastes.html similarity index 100% rename from cmd/web/tmpl/nopastes.html rename to cmd/tclipd/tmpl/nopastes.html diff --git a/cmd/web/tmpl/notfound.html b/cmd/tclipd/tmpl/notfound.html similarity index 100% rename from cmd/web/tmpl/notfound.html rename to cmd/tclipd/tmpl/notfound.html diff --git a/cmd/web/tmpl/pastecreated.html b/cmd/tclipd/tmpl/pastecreated.html similarity index 100% rename from cmd/web/tmpl/pastecreated.html rename to cmd/tclipd/tmpl/pastecreated.html diff --git a/cmd/web/tmpl/publicindex.html b/cmd/tclipd/tmpl/publicindex.html similarity index 100% rename from cmd/web/tmpl/publicindex.html rename to cmd/tclipd/tmpl/publicindex.html diff --git a/cmd/web/tmpl/showpaste.html b/cmd/tclipd/tmpl/showpaste.html similarity index 100% rename from cmd/web/tmpl/showpaste.html rename to cmd/tclipd/tmpl/showpaste.html diff --git a/flake.nix b/flake.nix index 165f12b..0b7e655 100644 --- a/flake.nix +++ b/flake.nix @@ -35,18 +35,18 @@ version = builtins.substring 0 8 self.lastModifiedDate; in { packages = rec { - web = pkgs.buildGoApplication { - pname = "tclip-web"; + tclipd = pkgs.buildGoApplication { + pname = "tclipd"; version = "0.1.0-${version}"; go = pkgs.go_1_21; src = ./.; - subPackages = "cmd/web"; + subPackages = "cmd/tclipd"; modules = ./gomod2nix.toml; }; tclip = pkgs.buildGoApplication { pname = "tclip"; - inherit (web) src version modules; + inherit (tclipd) src version modules; subPackages = "cmd/tclip"; go = pkgs.go_1_21; @@ -56,7 +56,7 @@ docker = pkgs.dockerTools.buildLayeredImage { name = "ghcr.io/tailscale-dev/tclip"; tag = "latest"; - config.Cmd = [ "${web}/bin/web" ]; + config.Cmd = [ "${tclipd}/bin/tclipd" ]; contents = [ pkgs.cacert ]; }; @@ -64,10 +64,10 @@ web-service = pkgs.substituteAll { name = "tclip.service"; src = ./run/portable-service/tclip.service.in; - inherit web; + inherit tclipd; }; in pkgs.portableService { - inherit (web) version; + inherit (tclipd) version; pname = "tclip"; description = "The tclip service"; homepage = "https://github.com/tailscale-dev/tclip"; diff --git a/run/portable-service/tclip.service.in b/run/portable-service/tclip.service.in index 42712c2..3869975 100644 --- a/run/portable-service/tclip.service.in +++ b/run/portable-service/tclip.service.in @@ -6,7 +6,7 @@ Documentation=https://github.com/tailscale-dev/tclip DynamicUser=yes StateDirectory=tclip Environment=DATA_DIR=/var/lib/private/tclip/data -ExecStart=@web@/bin/web +ExecStart=@tclipd@/bin/tclipd Restart=always RestartSec=30s