diff --git a/.dockerignore b/.dockerignore index a80bc64..edcad9c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -16,6 +16,7 @@ frontend/node_modules openvpn-web-ui openvpn-ui openvpn-admin +ovpn-admin docker-compose.yaml -docker-compose-slave.yaml \ No newline at end of file +docker-compose-slave.yaml diff --git a/.github/workflows/publish-latest.yaml b/.github/workflows/publish-latest.yaml index e2e5710..5f09ebe 100644 --- a/.github/workflows/publish-latest.yaml +++ b/.github/workflows/publish-latest.yaml @@ -17,14 +17,14 @@ jobs: with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - repository: flant/openvpn-admin + repository: flant/ovpn-admin tags: openvpn-latest dockerfile: Dockerfile.openvpn - - name: Push openvpn-admin image to Docker Hub + - name: Push ovpn-admin image to Docker Hub uses: docker/build-push-action@v1 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - repository: flant/openvpn-admin + repository: flant/ovpn-admin tags: latest dockerfile: Dockerfile diff --git a/.github/workflows/publish-tag.yaml b/.github/workflows/publish-tag.yaml index ba51323..5047655 100644 --- a/.github/workflows/publish-tag.yaml +++ b/.github/workflows/publish-tag.yaml @@ -21,14 +21,14 @@ jobs: with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - repository: flant/openvpn-admin + repository: flant/ovpn-admin tags: openvpn-${{ steps.get_version.outputs.VERSION }} dockerfile: Dockerfile.openvpn - - name: Push openvpn-admin image to Docker Hub + - name: Push ovpn-admin image to Docker Hub uses: docker/build-push-action@v1 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - repository: flant/openvpn-admin + repository: flant/ovpn-admin tags: ${{ steps.get_version.outputs.VERSION }} dockerfile: Dockerfile diff --git a/.gitignore b/.gitignore index 9ae1cab..748e1e9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ ccd_slave openvpn-web-ui openvpn-ui openvpn-admin +ovpn-admin frontend/node_modules main-packr.go @@ -17,4 +18,4 @@ packrd/ *.suo *.ntvs* *.njsproj -*.sln \ No newline at end of file +*.sln diff --git a/Dockerfile b/Dockerfile index 05b7a4d..5c85ed8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,11 @@ RUN cd /app && npm install && npm run build FROM golang:1.14.2-buster AS backend-builder COPY --from=frontend-builder /app/static /app/frontend/static COPY . /app -RUN go get -u github.com/gobuffalo/packr/v2/packr2 && cd /app && packr2 && env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags='-linkmode external -extldflags "-static" -s -w' -o openvpn-admin && packr2 clean +RUN go get -u github.com/gobuffalo/packr/v2/packr2 && cd /app && packr2 && env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags='-linkmode external -extldflags "-static" -s -w' -o ovpn-admin && packr2 clean FROM alpine:3.13 WORKDIR /app -COPY --from=backend-builder /app/openvpn-admin /app +COPY --from=backend-builder /app/ovpn-admin /app RUN apk add --update bash easy-rsa && \ ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \ wget https://github.com/pashcovich/openvpn-user/releases/download/v1.0.3-rc.1/openvpn-user-linux-amd64.tar.gz -O - | tar xz -C /usr/local/bin && \ diff --git a/build.sh b/build.sh index 00e48ef..15ed839 100755 --- a/build.sh +++ b/build.sh @@ -7,6 +7,6 @@ cd frontend && npm install && npm run build && cd .. packr2 -CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-linkmode external -extldflags -static -s -w" -o openvpn-admin +CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-linkmode external -extldflags -static -s -w" -o ovpn-admin packr2 clean diff --git a/docker-compose-slave.yaml b/docker-compose-slave.yaml index 05efeda..4559db6 100644 --- a/docker-compose-slave.yaml +++ b/docker-compose-slave.yaml @@ -13,15 +13,15 @@ services: - NET_ADMIN ports: - 7778:1194 # for openvpn - - 8081:8080 # for openvpn-admin because of network_mode + - 8081:8080 # for ovpn-admin because of network_mode volumes: - ./easyrsa_slave:/etc/openvpn/easyrsa - ./ccd_slave:/etc/openvpn/ccd - openvpn-admin: + ovpn-admin: build: context: . - image: openvpn-admin:local - command: /app/openvpn-admin --debug --ovpn.network="172.16.100.0/22" --master.sync-token="TOKEN" --master.host="http://172.20.0.1:8080" --role="slave" --ovpn.server="127.0.0.1:7777:tcp" --ovpn.server="127.0.0.1:7778:tcp" --easyrsa.path="/mnt/easyrsa" --easyrsa.index-path="/mnt/easyrsa/pki/index.txt" + image: ovpn-admin:local + command: /app/ovpn-admin --debug --ovpn.network="172.16.100.0/22" --master.sync-token="TOKEN" --master.host="http://172.20.0.1:8080" --role="slave" --ovpn.server="127.0.0.1:7777:tcp" --ovpn.server="127.0.0.1:7778:tcp" --easyrsa.path="/mnt/easyrsa" --easyrsa.index-path="/mnt/easyrsa/pki/index.txt" environment: - OPVN_SLAVE=1 network_mode: service:openvpn diff --git a/docker-compose.yaml b/docker-compose.yaml index 5cebfa2..3eea317 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,15 +11,15 @@ services: - NET_ADMIN ports: - 7777:1194 # for openvpn - - 8080:8080 # for openvpn-admin because of network_mode + - 8080:8080 # for ovpn-admin because of network_mode volumes: - ./easyrsa_master:/etc/openvpn/easyrsa - ./ccd_master:/etc/openvpn/ccd - openvpn-admin: + ovpn-admin: build: context: . - image: openvpn-admin:local - command: /app/openvpn-admin --debug --ovpn.network="172.16.100.0/22" --master.sync-token="TOKEN" --easyrsa.path="/mnt/easyrsa" --easyrsa.index-path="/mnt/easyrsa/pki/index.txt" --ovpn.server="127.0.0.1:7777:tcp" + image: ovpn-admin:local + command: /app/ovpn-admin --debug --ovpn.network="172.16.100.0/22" --master.sync-token="TOKEN" --easyrsa.path="/mnt/easyrsa" --easyrsa.index-path="/mnt/easyrsa/pki/index.txt" --ovpn.server="127.0.0.1:7777:tcp" network_mode: service:openvpn volumes: - ./easyrsa_master:/mnt/easyrsa diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8865d42..5a08a7d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,5 +1,5 @@ { - "name": "openvpn-admin", + "name": "ovpn-admin", "version": "1.0.1a", "lockfileVersion": 1, "requires": true, diff --git a/frontend/package.json b/frontend/package.json index 28b7e08..cffdc91 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "openvpn-admin", + "name": "ovpn-admin", "description": "Vue.js admin ui for openvpn and easyrsa", "version": "1.0.1a", "author": "vitaliy.snurnitsin@gmail.com", diff --git a/frontend/static/index.html b/frontend/static/index.html index f0558b1..3926847 100644 --- a/frontend/static/index.html +++ b/frontend/static/index.html @@ -2,7 +2,7 @@ - openvpn-admin + ovpn-admin diff --git a/go.mod b/go.mod index d3b42d3..4322638 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module openvpn-admin +module ovpn-admin go 1.14 diff --git a/main.go b/main.go index ab52cb0..fc856a5 100644 --- a/main.go +++ b/main.go @@ -36,8 +36,8 @@ const ( ) var ( - listenHost = kingpin.Flag("listen.host","host for openvpn-admin").Default("0.0.0.0").String() - listenPort = kingpin.Flag("listen.port","port for openvpn-admin").Default("8080").String() + listenHost = kingpin.Flag("listen.host","host for ovpn-admin").Default("0.0.0.0").String() + listenPort = kingpin.Flag("listen.port","port for ovpn-admin").Default("8080").String() serverRole = kingpin.Flag("role","server role master or slave").Default("master").HintOptions("master", "slave").String() masterHost = kingpin.Flag("master.host","url for master server").Default("http://127.0.0.1").String() masterBasicAuthUser = kingpin.Flag("master.basic-auth.user","user for basic auth on master server url").Default("").String() diff --git a/werf.yaml b/werf.yaml index 838d9f8..0ce7199 100644 --- a/werf.yaml +++ b/werf.yaml @@ -1,8 +1,8 @@ -project: openvpn-admin +project: ovpn-admin configVersion: 1 --- -image: openvpn-admin +image: ovpn-admin dockerfile: Dockerfile ---