tailscale / tailscale/tailscale

FR: Rename tailscale.nginx-auth in mkdeb.sh to tailscale-nginx-auth

Open
#8,446 1 comment 0 reactions 0 assignees View on GitHub
fr L3 Some users P1 Nuisance T0 New feature
Dominant language
Go
Stars
36.5k
Forks
3.2k
Avg merge
1d 23h
Merged PRs (30d)
132

Description

### What is the issue?

The dot (`.`) is not intended for indicating a subpackage.

### Steps to reproduce

See

### Are there any recent changes that introduced the issue?

_No response_

### OS

Linux

### OS version

_No response_

### Tailscale version

1.44.0

### Other software

```patch
diff --git a/cmd/nginx-auth/.gitignore b/cmd/nginx-auth/.gitignore
index 3c608aeb..e45476e0 100644
--- a/cmd/nginx-auth/.gitignore
+++ b/cmd/nginx-auth/.gitignore
@@ -1,4 +1,4 @@
nga.sock
*.deb
*.rpm
-tailscale.nginx-auth
+tailscale-nginx-auth
diff --git a/cmd/nginx-auth/README.md b/cmd/nginx-auth/README.md
index 858f9ab8..439b21a7 100644
--- a/cmd/nginx-auth/README.md
+++ b/cmd/nginx-auth/README.md
@@ -31,7 +31,7 @@ Create an authentication location with the `internal` flag set:
location /auth {
internal;

- proxy_pass http://unix:/run/tailscale.nginx-auth.sock;
+ proxy_pass http://unix:/run/tailscale-nginx-auth.sock;
proxy_pass_request_body off;

proxy_set_header Host $http_host;
diff --git a/cmd/nginx-auth/deb/postinst.sh b/cmd/nginx-auth/deb/postinst.sh
index d352a848..0695a135 100755
--- a/cmd/nginx-auth/deb/postinst.sh
+++ b/cmd/nginx-auth/deb/postinst.sh
@@ -1,14 +1,14 @@
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
- deb-systemd-helper unmask 'tailscale.nginx-auth.socket' >/dev/null || true
- if deb-systemd-helper --quiet was-enabled 'tailscale.nginx-auth.socket'; then
- deb-systemd-helper enable 'tailscale.nginx-auth.socket' >/dev/null || true
+ deb-systemd-helper unmask 'tailscale-nginx-auth.socket' >/dev/null || true
+ if deb-systemd-helper --quiet was-enabled 'tailscale-nginx-auth.socket'; then
+ deb-systemd-helper enable 'tailscale-nginx-auth.socket' >/dev/null || true
else
- deb-systemd-helper update-state 'tailscale.nginx-auth.socket' >/dev/null || true
+ deb-systemd-helper update-state 'tailscale-nginx-auth.socket' >/dev/null || true
fi

- if systemctl is-active tailscale.nginx-auth.socket >/dev/null; then
+ if systemctl is-active tailscale-nginx-auth.socket >/dev/null; then
systemctl --system daemon-reload >/dev/null || true
- deb-systemd-invoke stop 'tailscale.nginx-auth.service' >/dev/null || true
- deb-systemd-invoke restart 'tailscale.nginx-auth.socket' >/dev/null || true
+ deb-systemd-invoke stop 'tailscale-nginx-auth.service' >/dev/null || true
+ deb-systemd-invoke restart 'tailscale-nginx-auth.socket' >/dev/null || true
fi
fi
diff --git a/cmd/nginx-auth/deb/postrm.sh b/cmd/nginx-auth/deb/postrm.sh
index 4bce8613..0a0b8718 100755
--- a/cmd/nginx-auth/deb/postrm.sh
+++ b/cmd/nginx-auth/deb/postrm.sh
@@ -6,14 +6,14 @@ fi

if [ -x "/usr/bin/deb-systemd-helper" ]; then
if [ "$1" = "remove" ]; then
- deb-systemd-helper mask 'tailscale.nginx-auth.socket' >/dev/null || true
- deb-systemd-helper mask 'tailscale.nginx-auth.service' >/dev/null || true
+ deb-systemd-helper mask 'tailscale-nginx-auth.socket' >/dev/null || true
+ deb-systemd-helper mask 'tailscale-nginx-auth.service' >/dev/null || true
fi

if [ "$1" = "purge" ]; then
- deb-systemd-helper purge 'tailscale.nginx-auth.socket' >/dev/null || true
- deb-systemd-helper unmask 'tailscale.nginx-auth.socket' >/dev/null || true
- deb-systemd-helper purge 'tailscale.nginx-auth.service' >/dev/null || true
- deb-systemd-helper unmask 'tailscale.nginx-auth.service' >/dev/null || true
+ deb-systemd-helper purge 'tailscale-nginx-auth.socket' >/dev/null || true
+ deb-systemd-helper unmask 'tailscale-nginx-auth.socket' >/dev/null || true
+ deb-systemd-helper purge 'tailscale-nginx-auth.service' >/dev/null || true
+ deb-systemd-helper unmask 'tailscale-nginx-auth.service' >/dev/null || true
fi
fi
diff --git a/cmd/nginx-auth/deb/prerm.sh b/cmd/nginx-auth/deb/prerm.sh
index e4becd17..1d6484c8 100755
--- a/cmd/nginx-auth/deb/prerm.sh
+++ b/cmd/nginx-auth/deb/prerm.sh
@@ -2,7 +2,7 @@
set -e
if [ "$1" = "remove" ]; then
if [ -d /run/systemd/system ]; then
- deb-systemd-invoke stop 'tailscale.nginx-auth.service' >/dev/null || true
- deb-systemd-invoke stop 'tailscale.nginx-auth.socket' >/dev/null || true
+ deb-systemd-invoke stop 'tailscale-nginx-auth.service' >/dev/null || true
+ deb-systemd-invoke stop 'tailscale-nginx-auth.socket' >/dev/null || true
fi
fi
diff --git a/cmd/nginx-auth/mkdeb.sh b/cmd/nginx-auth/mkdeb.sh
index 59f43230..8c6841d6 100755
--- a/cmd/nginx-auth/mkdeb.sh
+++ b/cmd/nginx-auth/mkdeb.sh
@@ -2,9 +2,9 @@

set -e

-VERSION=0.1.3
+VERSION=0.1.4
for ARCH in amd64 arm64; do
- CGO_ENABLED=0 GOARCH=${ARCH} GOOS=linux go build -o tailscale.nginx-auth .
+ CGO_ENABLED=0 GOARCH=${ARCH} GOOS=linux go build -o tailscale-nginx-auth .

mkpkg \
--out=tailscale-nginx-auth-${VERSION}-${ARCH}.deb \
@@ -16,7 +16,7 @@ for ARCH in amd64 arm64; do
--postrm=deb/postrm.sh \
--prerm=deb/prerm.sh \
--description="Tailscale NGINX authentication protocol handler" \
- --files=./tailscale.nginx-auth:/usr/sbin/tailscale.nginx-auth,./tailscale.nginx-auth.socket:/lib/systemd/system/tailscale.nginx-auth.socket,./tailscale.nginx-auth.service:/lib/systemd/system/tailscale.nginx-auth.service,./README.md:/usr/share/tailscale/nginx-auth/README.md
+ --files=./tailscale-nginx-auth:/usr/libexec/tailscale/nginx-auth,./tailscale-nginx-auth.socket:/lib/systemd/system/tailscale-nginx-auth.socket,./tailscale-nginx-auth.service:/lib/systemd/system/tailscale-nginx-auth.service,./README.md:/usr/share/doc/tailscale-nginx-auth/README.md

mkpkg \
--out=tailscale-nginx-auth-${VERSION}-${ARCH}.rpm \
@@ -28,5 +28,5 @@ for ARCH in amd64 arm64; do
--postrm=rpm/postrm.sh \
--prerm=rpm/prerm.sh \
--description="Tailscale NGINX authentication protocol handler" \
- --files=./tailscale.nginx-auth:/usr/sbin/tailscale.nginx-auth,./tailscale.nginx-auth.socket:/lib/systemd/system/tailscale.nginx-auth.socket,./tailscale.nginx-auth.service:/lib/systemd/system/tailscale.nginx-auth.service,./README.md:/usr/share/tailscale/nginx-auth/README.md
+ --files=./tailscale-nginx-auth:/usr/libexec/tailscale/nginx-auth,./tailscale-nginx-auth.socket:/lib/systemd/system/tailscale-nginx-auth.socket,./tailscale-nginx-auth.service:/lib/systemd/system/tailscale-nginx-auth.service,./README.md:/usr/share/doc/tailscale-nginx-auth/README.md
done
diff --git a/cmd/nginx-auth/nginx-auth.go b/cmd/nginx-auth/nginx-auth.go
index 09da74da..2a499b3f 100644
--- a/cmd/nginx-auth/nginx-auth.go
+++ b/cmd/nginx-auth/nginx-auth.go
@@ -123,6 +123,8 @@ func main() {
}

for {
- select {}
+ select {
+ default:
+ }
}
}
diff --git a/cmd/nginx-auth/rpm/postrm.sh b/cmd/nginx-auth/rpm/postrm.sh
index 3d0abfb1..e3b1936c 100755
--- a/cmd/nginx-auth/rpm/postrm.sh
+++ b/cmd/nginx-auth/rpm/postrm.sh
@@ -4,6 +4,6 @@
systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
- systemctl stop tailscale.nginx-auth.service >/dev/null 2>&1 || :
- systemctl try-restart tailscale.nginx-auth.socket >/dev/null 2>&1 || :
+ systemctl stop tailscale-nginx-auth.service >/dev/null 2>&1 || :
+ systemctl try-restart tailscale-nginx-auth.socket >/dev/null 2>&1 || :
fi
diff --git a/cmd/nginx-auth/rpm/prerm.sh b/cmd/nginx-auth/rpm/prerm.sh
index 1f198d82..dce476e0 100755
--- a/cmd/nginx-auth/rpm/prerm.sh
+++ b/cmd/nginx-auth/rpm/prerm.sh
@@ -3,7 +3,7 @@

if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
- systemctl --no-reload disable tailscale.nginx-auth.socket > /dev/null 2>&1 || :
- systemctl stop tailscale.nginx-auth.socket > /dev/null 2>&1 || :
- systemctl stop tailscale.nginx-auth.service > /dev/null 2>&1 || :
+ systemctl --no-reload disable tailscale-nginx-auth.socket > /dev/null 2>&1 || :
+ systemctl stop tailscale-nginx-auth.socket > /dev/null 2>&1 || :
+ systemctl stop tailscale-nginx-auth.service > /dev/null 2>&1 || :
fi
diff --git a/cmd/nginx-auth/tailscale.nginx-auth.service b/cmd/nginx-auth/tailscale-nginx-auth.service
similarity index 78%
rename from cmd/nginx-auth/tailscale.nginx-auth.service
rename to cmd/nginx-auth/tailscale-nginx-auth.service
index 086f6c77..cbbe0304 100644
--- a/cmd/nginx-auth/tailscale.nginx-auth.service
+++ b/cmd/nginx-auth/tailscale-nginx-auth.service
@@ -4,7 +4,7 @@ After=nginx.service
Wants=nginx.service

[Service]
-ExecStart=/usr/sbin/tailscale.nginx-auth
+ExecStart=/usr/libexec/tailscale/nginx-auth
DynamicUser=yes

[Install]
diff --git a/cmd/nginx-auth/tailscale-nginx-auth.socket b/cmd/nginx-auth/tailscale-nginx-auth.socket
new file mode 100644
index 00000000..6ddb9975
--- /dev/null
+++ b/cmd/nginx-auth/tailscale-nginx-auth.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Tailscale NGINX Authentication socket
+PartOf=tailscale-nginx-auth.service
+
+[Socket]
+ListenStream=/run/tailscale-nginx-auth.sock
+
+[Install]
+WantedBy=sockets.target
diff --git a/cmd/nginx-auth/tailscale.nginx-auth.socket b/cmd/nginx-auth/tailscale.nginx-auth.socket
deleted file mode 100644
index 7e5641ff..00000000
--- a/cmd/nginx-auth/tailscale.nginx-auth.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Tailscale NGINX Authentication socket
-PartOf=tailscale.nginx-auth.service
-
-[Socket]
-ListenStream=/var/run/tailscale.nginx-auth.sock
-
-[Install]
-WantedBy=sockets.target
\ No newline at end of file
```

### Bug report

_No response_

Contributor guide

Open the contributing guide

Research direction

Start with cmd/nginx-auth/mkdeb.sh and compare the artifact names it passes to mkpkg with the service, socket, and README paths shown in the issue. Confirm the rename is consistent across cmd/nginx-auth/.gitignore, deb/*.sh, rpm/*.sh, nginx-auth.go, and the systemd unit files, then verify the Debian and RPM packaging commands complete successfully.

Written by the indexing model from the issue text.

Assessment

Tech stack
go, shell
Domain
build-system, devops
Issue type
Refactor
Difficulty
3/5
Estimated time
1-2 days
Activity status
Stale
Clarity
Clearly specified
Newbie friendliness
35/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.