From c9e7897f80df4a81d6c353a815a7d6b36ea2607c Mon Sep 17 00:00:00 2001
From: Mark Puha
Date: Mon, 24 Feb 2025 11:17:50 +0100
Subject: [PATCH] revert name changes
---
.gitignore | 2 +-
Dockerfile | 2 +-
Makefile | 10 +++++-----
README.md | 6 +++---
ipc/uapi_unix.go | 2 +-
ipc/uapi_windows.go | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
index cb8b7caa1..57fe9ed59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-euphoria
+amneziawg-go
diff --git a/Dockerfile b/Dockerfile
index de4696e25..9b764b9ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,4 +17,4 @@ RUN apk --no-cache add iproute2 iptables bash && \
chmod +x /usr/bin/awg /usr/bin/awg-quick && \
ln -s /usr/bin/awg /usr/bin/wg && \
ln -s /usr/bin/awg-quick /usr/bin/wg-quick
-COPY --from=euphoria /usr/bin/euphoria /usr/bin/euphoria
+COPY --from=euphoria /usr/bin/euphoria /usr/bin/amneziawg-go
diff --git a/Makefile b/Makefile
index 664af718b..091ac4d06 100644
--- a/Makefile
+++ b/Makefile
@@ -14,18 +14,18 @@ generate-version-and-build:
[ "$$(cat version.go 2>/dev/null)" != "$$ver" ] && \
echo "$$ver" > version.go && \
git update-index --assume-unchanged version.go || true
- @$(MAKE) euphoria
+ @$(MAKE) amneziawg-go
-euphoria: $(wildcard *.go) $(wildcard */*.go)
+amneziawg-go: $(wildcard *.go) $(wildcard */*.go)
go build -tags luajit -ldflags="-w -s" -trimpath -v -o "$@"
-install: euphoria
- @install -v -d "$(DESTDIR)$(BINDIR)" && install -v -m 0755 "$<" "$(DESTDIR)$(BINDIR)/euphoria"
+install: amneziawg-go
+ @install -v -d "$(DESTDIR)$(BINDIR)" && install -v -m 0755 "$<" "$(DESTDIR)$(BINDIR)/amneziawg-go"
test:
go test ./...
clean:
- rm -f euphoria
+ rm -f amneziawg-go
.PHONY: all clean test install generate-version-and-build
diff --git a/README.md b/README.md
index fb35bbdd0..dbe00d685 100644
--- a/README.md
+++ b/README.md
@@ -11,15 +11,15 @@ As a result, AmneziaWG maintains high performance while adding an extra layer of
Simply run:
```
-$ euphoria wg0
+$ amneziawg-go wg1
```
-This will create an interface and fork into the background. To remove the interface, use the usual `ip link del wg0`, or if your system does not support removing interfaces directly, you may instead remove the control socket via `rm -f /var/run/euphoria/wg0.sock`, which will result in euphoria shutting down.
+This will create an interface and fork into the background. To remove the interface, use the usual `ip link del wg0`, or if your system does not support removing interfaces directly, you may instead remove the control socket via `rm -f /var/run/amneziawg-go/wg0.sock`, which will result in euphoria shutting down.
To run euphoria without forking to the background, pass `-f` or `--foreground`:
```
-$ euphoria -f wg0
+$ amneziawg-go -f wg0
```
When an interface is running, you may use [`euphoria-tools`](https://github.com/amnezia-vpn/euphoria-tools) to configure it, as well as the usual `ip(8)` and `ifconfig(8)` commands.
diff --git a/ipc/uapi_unix.go b/ipc/uapi_unix.go
index 4a5aff317..0da452a7e 100644
--- a/ipc/uapi_unix.go
+++ b/ipc/uapi_unix.go
@@ -26,7 +26,7 @@ const (
// socketDirectory is variable because it is modified by a linker
// flag in wireguard-android.
-var socketDirectory = "/var/run/euphoria"
+var socketDirectory = "/var/run/amneziawg"
func sockPath(iface string) string {
return fmt.Sprintf("%s/%s.sock", socketDirectory, iface)
diff --git a/ipc/uapi_windows.go b/ipc/uapi_windows.go
index 829861642..42423c8c8 100644
--- a/ipc/uapi_windows.go
+++ b/ipc/uapi_windows.go
@@ -62,7 +62,7 @@ func init() {
func UAPIListen(name string) (net.Listener, error) {
listener, err := (&namedpipe.ListenConfig{
SecurityDescriptor: UAPISecurityDescriptor,
- }).Listen(`\\.\pipe\ProtectedPrefix\Administrators\Euphoria\` + name)
+ }).Listen(`\\.\pipe\ProtectedPrefix\Administrators\AmneziaWG\` + name)
if err != nil {
return nil, err
}