Merge b76639308a into 70f9f91112

Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3-alpine
 
 ARG VERSION="git"
-ARG PACKAGES="bash libffi openssh-client openssl rsync tini gcc libffi-dev linux-headers make musl-dev openssl-dev"
+ARG PACKAGES="bash libffi openssh-client openssl rsync tini gcc libffi-dev linux-headers make musl-dev openssl-dev cargo"
 
 LABEL name="algo" \
       version="${VERSION}" \

Makefile

@@ -1,10 +1,10 @@
 ## docker-build: Build and tag a docker image
 .PHONY: docker-build
 
-IMAGE          := trailofbits/algo
-TAG	  	       := latest
-DOCKERFILE     := Dockerfile
-CONFIGURATIONS := $(shell pwd)
+IMAGE 		:= trailofbits/algo
+TAG			:= latest
+DOCKERFILE	:= Dockerfile
+PWD			:= $$(pwd)
 
 docker-build:
 	docker build \
@@ -21,10 +21,22 @@ docker-deploy:
 	--cap-drop=all \
 	--rm \
 	-it \
-	-v $(CONFIGURATIONS):/data \
+	-v $(PWD):/data \
 	$(IMAGE):$(TAG)
 
-## docker-clean: Remove images and containers.
+# update the users on existing VPN
+.PHONY: docker-update
+
+docker-update:
+	docker run \
+	--cap-drop=all \
+	--rm \
+	-it \
+	-e "ALGO_ARGS=update-users" \
+	-v $(PWD):/data \
+	$(IMAGE):$(TAG)
+
+## docker-prune: Remove images and containers.
 .PHONY: docker-prune
 
 docker-prune:

roles/wireguard/defaults/main.yml

@@ -13,8 +13,6 @@ wireguard_dns_servers: >-
   {% for host in dns_servers.ipv4 %}{{ host }}{% if not loop.last %},{% endif %}{% endfor %}{% if ipv6_support %},{% for host in dns_servers.ipv6 %}{{ host }}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}
   {% endif %}
 wireguard_client_ip: >-
-  {{ wireguard_network_ipv4 | ipmath(index|int+2) }}
-  {{ ',' + wireguard_network_ipv6 | ipmath(index|int+2) if ipv6_support else '' }}
+  {{ wireguard_network_ipv4 | ipmath(index|int+2) }}{{ ', ' + wireguard_network_ipv6 | ipmath(index|int+2) if ipv6_support else '' }}
 wireguard_server_ip: >-
-  {{ wireguard_network_ipv4 | ipaddr('1') }}
-  {{ ',' + wireguard_network_ipv6 | ipaddr('1') if ipv6_support else '' }}
+  {{ wireguard_network_ipv4 | ipaddr('1') }}{{ ', ' + wireguard_network_ipv6 | ipaddr('1') if ipv6_support else '' }}