wallenstein/algo
1
0
Fork 0
mirror of https://github.com/trailofbits/algo.git synced 2025-08-01 18:33:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge b76639308a into 70f9f91112

Browse source
This commit is contained in:
Sam Sipe 2021-02-17 23:51:34 +00:00 • committed by GitHub
commit 8a3b06e0a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,7 +1,7 @@
FROM python:3-alpine FROM python:3-alpine
ARG VERSION="git" 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" \ LABEL name="algo" \
version="${VERSION}" \ version="${VERSION}" \

24
Makefile
View file

@ -1,10 +1,10 @@
## docker-build: Build and tag a docker image ## docker-build: Build and tag a docker image
.PHONY: docker-build .PHONY: docker-build
IMAGE := trailofbits/algo IMAGE := trailofbits/algo
TAG := latest TAG := latest
DOCKERFILE := Dockerfile DOCKERFILE := Dockerfile
CONFIGURATIONS := $(shell pwd) PWD := $$(pwd)
docker-build: docker-build:
docker build \ docker build \
@ -21,10 +21,22 @@ docker-deploy:
--cap-drop=all \ --cap-drop=all \
--rm \ --rm \
-it \ -it \
-v $(CONFIGURATIONS):/data \ -v $(PWD):/data \
$(IMAGE):$(TAG) $(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 .PHONY: docker-prune
docker-prune: docker-prune:

6
roles/wireguard/defaults/main.yml
View file

@ -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 %} {% 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 %} {% endif %}
wireguard_client_ip: >- wireguard_client_ip: >-
{{ wireguard_network_ipv4 | ipmath(index|int+2) }} {{ wireguard_network_ipv4 | ipmath(index|int+2) }}{{ ', ' + wireguard_network_ipv6 | ipmath(index|int+2) if ipv6_support else '' }}
{{ ',' + wireguard_network_ipv6 | ipmath(index|int+2) if ipv6_support else '' }}
wireguard_server_ip: >- wireguard_server_ip: >-
{{ wireguard_network_ipv4 | ipaddr('1') }} {{ wireguard_network_ipv4 | ipaddr('1') }}{{ ', ' + wireguard_network_ipv6 | ipaddr('1') if ipv6_support else '' }}
{{ ',' + wireguard_network_ipv6 | ipaddr('1') if ipv6_support else '' }}