Skip to content

Commit

Permalink
Merge pull request #36 from tailscale-dev/Xe/tclipd
Browse files Browse the repository at this point in the history
cmd/web: rename to tclipd
  • Loading branch information
Xe Iaso authored Sep 19, 2023
2 parents 4085af8 + 90fa48d commit 2e7c605
Show file tree
Hide file tree
Showing 61 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -56,18 +56,18 @@
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 ];
};

portable-service = let
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";
Expand Down
2 changes: 1 addition & 1 deletion run/portable-service/tclip.service.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2e7c605

Please sign in to comment.