Skip to content

Commit 4693fa0

Browse files
Bot Updating Templated Files
1 parent 6f7b41c commit 4693fa0

File tree

1 file changed

+96
-58
lines changed

1 file changed

+96
-58
lines changed

readme-vars.yml

Lines changed: 96 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,55 +6,49 @@ project_url: "https://www.wireguard.com/"
66
project_logo: "https://www.wireguard.com/img/wireguard.svg"
77
project_blurb: "[WireGuard®]({{ project_url }}) is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more useful than IPsec, while avoiding the massive headache. It intends to be considerably more performant than OpenVPN. WireGuard is designed as a general purpose VPN for running on embedded interfaces and super computers alike, fit for many different circumstances. Initially released for the Linux kernel, it is now cross-platform (Windows, macOS, BSD, iOS, Android) and widely deployable. It is currently under heavy development, but already it might be regarded as the most secure, easiest to use, and simplest VPN solution in the industry."
88
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
9-
109
# supported architectures
1110
available_architectures:
12-
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
13-
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
14-
11+
- {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
12+
- {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
1513
# development version
1614
development_versions: true
1715
development_versions_items:
18-
- { tag: "latest", desc: "Stable releases based on Alpine *without* support for compiling Wireguard modules." }
19-
- { tag: "legacy", desc: "Stable releases with support for compiling Wireguard modules for older kernels." }
20-
16+
- {tag: "latest", desc: "Stable releases based on Alpine *without* support for compiling Wireguard modules."}
17+
- {tag: "legacy", desc: "Stable releases with support for compiling Wireguard modules for older kernels."}
2118
# container parameters
2219
common_param_env_vars_enabled: true
2320
param_container_name: "{{ project_name }}"
2421
param_usage_include_vols: true
2522
param_volumes:
26-
- { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." }
23+
- {vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files."}
2724
opt_param_usage_include_vols: true
2825
opt_param_volumes:
29-
- { vol_path: "/lib/modules", vol_host_path: "/lib/modules", desc: "Maps host's modules folder. Only required if compiling wireguard modules." }
26+
- {vol_path: "/lib/modules", vol_host_path: "/lib/modules", desc: "Maps host's modules folder. Only required if compiling wireguard modules."}
3027
param_usage_include_ports: true
3128
param_ports:
32-
- { external_port: "51820", internal_port: "51820/udp", port_desc: "wireguard port" }
29+
- {external_port: "51820", internal_port: "51820/udp", port_desc: "wireguard port"}
3330
param_usage_include_env: true
3431
param_env_vars:
35-
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
32+
- {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
3633
cap_add_param: true
3734
cap_add_param_vars:
38-
- { cap_add_var: "NET_ADMIN", desc: "Neccessary for Wireguard to create its VPN interface." }
39-
- { cap_add_var: "SYS_MODULE", desc: "Neccessary for loading Wireguard kernel module if it's not already loaded." }
35+
- {cap_add_var: "NET_ADMIN", desc: "Neccessary for Wireguard to create its VPN interface."}
36+
- {cap_add_var: "SYS_MODULE", desc: "Neccessary for loading Wireguard kernel module if it's not already loaded."}
4037
custom_params:
41-
- { name: "sysctl", name_compose: "sysctls", value: ["net.ipv4.conf.all.src_valid_mark=1"], desc: "Required for client mode.", array: "true" }
42-
38+
- {name: "sysctl", name_compose: "sysctls", value: ["net.ipv4.conf.all.src_valid_mark=1"], desc: "Required for client mode.", array: "true"}
4339
# optional container parameters
4440
opt_param_usage_include_env: true
4541
opt_param_env_vars:
46-
- { env_var: "SERVERURL", env_value: "wireguard.domain.com", desc: "External IP or domain name for docker host. Used in server mode. If set to `auto`, the container will try to determine and set the external IP automatically"}
47-
- { env_var: "SERVERPORT", env_value: "51820", desc: "External port for docker host. Used in server mode."}
48-
- { env_var: "PEERS", env_value: "1", desc: "Number of peers to create confs for. Required for server mode. Can also be a list of names: `myPC,myPhone,myTablet` (alphanumeric only)"}
49-
- { env_var: "PEERDNS", env_value: "auto", desc: "DNS server set in peer/client configs (can be set as `8.8.8.8`). Used in server mode. Defaults to `auto`, which uses wireguard docker host's DNS via included CoreDNS forward."}
50-
- { env_var: "INTERNAL_SUBNET", env_value: "10.13.13.0", desc: "Internal subnet for the wireguard and server and peers (only change if it clashes). Used in server mode."}
51-
- { env_var: "ALLOWEDIPS", env_value: "0.0.0.0/0", desc: "The IPs/Ranges that the peers will be able to reach using the VPN connection. If not specified the default value is: '0.0.0.0/0, ::0/0' This will cause ALL traffic to route through the VPN, if you want split tunneling, set this to only the IPs you would like to use the tunnel AND the ip of the server's WG ip, such as 10.13.13.1."}
52-
- { env_var: "PERSISTENTKEEPALIVE_PEERS", env_value: "", desc: "Set to `all` or a list of comma separated peers (ie. `1,4,laptop`) for the wireguard server to send keepalive packets to listed peers every 25 seconds. Useful if server is accessed via domain name and has dynamic IP. Used only in server mode."}
53-
- { env_var: "LOG_CONFS", env_value: "true", desc: "Generated QR codes will be displayed in the docker log. Set to `false` to skip log output."}
54-
42+
- {env_var: "SERVERURL", env_value: "wireguard.domain.com", desc: "External IP or domain name for docker host. Used in server mode. If set to `auto`, the container will try to determine and set the external IP automatically"}
43+
- {env_var: "SERVERPORT", env_value: "51820", desc: "External port for docker host. Used in server mode."}
44+
- {env_var: "PEERS", env_value: "1", desc: "Number of peers to create confs for. Required for server mode. Can also be a list of names: `myPC,myPhone,myTablet` (alphanumeric only)"}
45+
- {env_var: "PEERDNS", env_value: "auto", desc: "DNS server set in peer/client configs (can be set as `8.8.8.8`). Used in server mode. Defaults to `auto`, which uses wireguard docker host's DNS via included CoreDNS forward."}
46+
- {env_var: "INTERNAL_SUBNET", env_value: "10.13.13.0", desc: "Internal subnet for the wireguard and server and peers (only change if it clashes). Used in server mode."}
47+
- {env_var: "ALLOWEDIPS", env_value: "0.0.0.0/0", desc: "The IPs/Ranges that the peers will be able to reach using the VPN connection. If not specified the default value is: '0.0.0.0/0, ::0/0' This will cause ALL traffic to route through the VPN, if you want split tunneling, set this to only the IPs you would like to use the tunnel AND the ip of the server's WG ip, such as 10.13.13.1."}
48+
- {env_var: "PERSISTENTKEEPALIVE_PEERS", env_value: "", desc: "Set to `all` or a list of comma separated peers (ie. `1,4,laptop`) for the wireguard server to send keepalive packets to listed peers every 25 seconds. Useful if server is accessed via domain name and has dynamic IP. Used only in server mode."}
49+
- {env_var: "LOG_CONFS", env_value: "true", desc: "Generated QR codes will be displayed in the docker log. Set to `false` to skip log output."}
5550
optional_block_1: false
5651
optional_block_1_items: ""
57-
5852
# application setup block
5953
app_setup_block_enabled: true
6054
app_setup_block: |
@@ -124,38 +118,82 @@ app_setup_block: |
124118
Keep in mind that this var will only be considered when the confs are regenerated. Adding this var for an existing peer won't force a regeneration. You can delete wg0.conf and restart the container to force regeneration if necessary.
125119
126120
Don't forget to set the necessary POSTUP and POSTDOWN rules in your client's peer conf for lan access.
127-
128-
121+
# init diagram
122+
init_diagram: |
123+
"wireguard:legacy": {
124+
docker-mods
125+
base {
126+
fix-attr +\nlegacy cont-init
127+
}
128+
docker-mods -> base
129+
legacy-services
130+
custom services
131+
init-services -> legacy-services
132+
init-services -> custom services
133+
custom services -> legacy-services
134+
legacy-services -> ci-service-check
135+
init-migrations -> init-adduser
136+
init-os-end -> init-config
137+
init-config -> init-config-end
138+
init-wireguard-confs -> init-config-end
139+
init-os-end -> init-crontab-config
140+
init-mods-end -> init-custom-files
141+
base -> init-envfile
142+
base -> init-migrations
143+
base -> init-mods
144+
init-config-end -> init-mods
145+
init-mods -> init-mods-end
146+
init-mods-package-install -> init-mods-end
147+
init-mods -> init-mods-package-install
148+
base -> init-os-end
149+
init-adduser -> init-os-end
150+
init-envfile -> init-os-end
151+
init-migrations -> init-os-end
152+
init-custom-files -> init-services
153+
init-mods-end -> init-services
154+
init-wireguard-module -> init-wireguard-confs
155+
init-config -> init-wireguard-module
156+
init-services -> svc-coredns
157+
svc-coredns -> legacy-services
158+
init-services -> svc-cron
159+
svc-cron -> legacy-services
160+
svc-coredns -> svc-wireguard
161+
svc-wireguard -> legacy-services
162+
}
163+
Base Images: {
164+
"baseimage-ubuntu:jammy"
165+
}
166+
"wireguard:legacy" <- Base Images
129167
# changelog
130168
changelogs:
131-
- { date: "03.10.23:", desc: "**Potentially Breaking Change:** Support for multiple interfaces added. Wireguard confs moved to `/config/wg_confs/`. Any file with a `.conf` extension in that folder will be treated as a live tunnel config and will be attempted to start. If any of the tunnels fail, all tunnels will be stopped. Tunnels are started in alphabetical order. Managed server conf will continue to be hardcoded to `wg0.conf`." }
132-
- { date: "24.06.23:", desc: "Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
133-
- { date: "26.04.23:", desc: "Rework branches, swap alpine & ubuntu builds." }
134-
- { date: "28.01.23:", desc: "Patch wg-quick to suppress false positive sysctl warning." }
135-
- { date: "10.01.23:", desc: "Add new var to add `PersistentKeepalive` to server config for select peers to survive server IP changes when domain name is used." }
136-
- { date: "26.10.22:", desc: "Better handle unsupported peer names. Improve logging." }
137-
- { date: "12.10.22:", desc: "Add Alpine branch. Optimize wg and coredns services." }
138-
- { date: "09.10.22:", desc: "Switch back to iptables-legacy due to issues on some hosts." }
139-
- { date: "04.10.22:", desc: "Rebase to Jammy. Upgrade to s6v3." }
140-
- { date: "16.05.22:", desc: "Improve NAT handling in server mode when multiple ethernet devices are present." }
141-
- { date: "23.04.22:", desc: "Add pre-shared key support. Automatically added to all new peer confs generated, existing ones are left without to ensure no breaking changes." }
142-
- { date: "10.04.22:", desc: "Rebase to Ubuntu Focal. Add `LOG_CONFS` env var. Remove deprecated `add-peer` command." }
143-
- { date: "28.10.21:", desc: "Add site-to-site vpn support." }
144-
- { date: "11.02.21:", desc: "Fix bug related to changing internal subnet and named peer confs not updating." }
145-
- { date: "06.10.20:", desc: "Disable CoreDNS in client mode, or if port 53 is already in use in server mode." }
146-
- { date: "04.10.20:", desc: "Allow to specify a list of names as PEERS and add ALLOWEDIPS environment variable. Also, add peer name/id to each one of the peer sections in wg0.conf. Important: Existing users need to delete `/config/templates/peer.conf` and restart" }
147-
- { date: "27.09.20:", desc: "Cleaning service binding example to have accurate PreDown script." }
148-
- { date: "06.08.20:", desc: "Replace resolvconf with openresolv due to dns issues when a client based on this image is connected to a server also based on this image. Add IPv6 info to readme. Display kernel version in logs." }
149-
- { date: "29.07.20:", desc: "Update Coredns config to detect dns loops (existing users need to delete `/config/coredns/Corefile` and restart)." }
150-
- { date: "27.07.20:", desc: "Update Coredns config to prevent issues with non-user-defined bridge networks (existing users need to delete `/config/coredns/Corefile` and restart)." }
151-
- { date: "05.07.20:", desc: "Add Debian updates and security repos for headers." }
152-
- { date: "25.06.20:", desc: "Simplify module tests, prevent iptables issues from resulting in false negatives." }
153-
- { date: "19.06.20:", desc: "Add support for Ubuntu Focal (20.04) kernels. Compile wireguard tools and kernel module instead of using the ubuntu packages. Make module install optional. Improve verbosity in logs." }
154-
- { date: "29.05.20:", desc: "Add support for 64bit raspbian." }
155-
- { date: "28.04.20:", desc: "Add Buster/Stretch backports repos for Debian. Tested with OMV 5 and OMV 4 (on kernel 4.19.0-0.bpo.8-amd64)." }
156-
- { date: "20.04.20:", desc: "Fix typo in client mode conf existence check." }
157-
- { date: "13.04.20:", desc: "Fix bug that forced conf recreation on every start." }
158-
- { date: "08.04.20:", desc: "Add arm32/64 builds and enable multi-arch (rpi4 with ubuntu and raspbian buster tested). Add CoreDNS for `PEERDNS=auto` setting. Update the `add-peer`/`show-peer` scripts to utilize the templates and the `INTERNAL_SUBNET` var (previously missed, oops)." }
159-
- { date: "05.04.20:", desc: "Add `INTERNAL_SUBNET` variable to prevent subnet clashes. Add templates for server and peer confs." }
160-
- { date: "01.04.20:", desc: "Add `show-peer` script and include info on host installed headers." }
161-
- { date: "31.03.20:", desc: "Initial Release." }
169+
- {date: "03.10.23:", desc: "**Potentially Breaking Change:** Support for multiple interfaces added. Wireguard confs moved to `/config/wg_confs/`. Any file with a `.conf` extension in that folder will be treated as a live tunnel config and will be attempted to start. If any of the tunnels fail, all tunnels will be stopped. Tunnels are started in alphabetical order. Managed server conf will continue to be hardcoded to `wg0.conf`."}
170+
- {date: "24.06.23:", desc: "Deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)."}
171+
- {date: "26.04.23:", desc: "Rework branches, swap alpine & ubuntu builds."}
172+
- {date: "28.01.23:", desc: "Patch wg-quick to suppress false positive sysctl warning."}
173+
- {date: "10.01.23:", desc: "Add new var to add `PersistentKeepalive` to server config for select peers to survive server IP changes when domain name is used."}
174+
- {date: "26.10.22:", desc: "Better handle unsupported peer names. Improve logging."}
175+
- {date: "12.10.22:", desc: "Add Alpine branch. Optimize wg and coredns services."}
176+
- {date: "09.10.22:", desc: "Switch back to iptables-legacy due to issues on some hosts."}
177+
- {date: "04.10.22:", desc: "Rebase to Jammy. Upgrade to s6v3."}
178+
- {date: "16.05.22:", desc: "Improve NAT handling in server mode when multiple ethernet devices are present."}
179+
- {date: "23.04.22:", desc: "Add pre-shared key support. Automatically added to all new peer confs generated, existing ones are left without to ensure no breaking changes."}
180+
- {date: "10.04.22:", desc: "Rebase to Ubuntu Focal. Add `LOG_CONFS` env var. Remove deprecated `add-peer` command."}
181+
- {date: "28.10.21:", desc: "Add site-to-site vpn support."}
182+
- {date: "11.02.21:", desc: "Fix bug related to changing internal subnet and named peer confs not updating."}
183+
- {date: "06.10.20:", desc: "Disable CoreDNS in client mode, or if port 53 is already in use in server mode."}
184+
- {date: "04.10.20:", desc: "Allow to specify a list of names as PEERS and add ALLOWEDIPS environment variable. Also, add peer name/id to each one of the peer sections in wg0.conf. Important: Existing users need to delete `/config/templates/peer.conf` and restart"}
185+
- {date: "27.09.20:", desc: "Cleaning service binding example to have accurate PreDown script."}
186+
- {date: "06.08.20:", desc: "Replace resolvconf with openresolv due to dns issues when a client based on this image is connected to a server also based on this image. Add IPv6 info to readme. Display kernel version in logs."}
187+
- {date: "29.07.20:", desc: "Update Coredns config to detect dns loops (existing users need to delete `/config/coredns/Corefile` and restart)."}
188+
- {date: "27.07.20:", desc: "Update Coredns config to prevent issues with non-user-defined bridge networks (existing users need to delete `/config/coredns/Corefile` and restart)."}
189+
- {date: "05.07.20:", desc: "Add Debian updates and security repos for headers."}
190+
- {date: "25.06.20:", desc: "Simplify module tests, prevent iptables issues from resulting in false negatives."}
191+
- {date: "19.06.20:", desc: "Add support for Ubuntu Focal (20.04) kernels. Compile wireguard tools and kernel module instead of using the ubuntu packages. Make module install optional. Improve verbosity in logs."}
192+
- {date: "29.05.20:", desc: "Add support for 64bit raspbian."}
193+
- {date: "28.04.20:", desc: "Add Buster/Stretch backports repos for Debian. Tested with OMV 5 and OMV 4 (on kernel 4.19.0-0.bpo.8-amd64)."}
194+
- {date: "20.04.20:", desc: "Fix typo in client mode conf existence check."}
195+
- {date: "13.04.20:", desc: "Fix bug that forced conf recreation on every start."}
196+
- {date: "08.04.20:", desc: "Add arm32/64 builds and enable multi-arch (rpi4 with ubuntu and raspbian buster tested). Add CoreDNS for `PEERDNS=auto` setting. Update the `add-peer`/`show-peer` scripts to utilize the templates and the `INTERNAL_SUBNET` var (previously missed, oops)."}
197+
- {date: "05.04.20:", desc: "Add `INTERNAL_SUBNET` variable to prevent subnet clashes. Add templates for server and peer confs."}
198+
- {date: "01.04.20:", desc: "Add `show-peer` script and include info on host installed headers."}
199+
- {date: "31.03.20:", desc: "Initial Release."}

0 commit comments

Comments
 (0)