Skip to content

Commit 6b73208

Browse files
committed
Remove OpenVPN support
The small amount of peers I have actually using this does not justify the maintanence
1 parent b89ba07 commit 6b73208

File tree

18 files changed

+2
-313
lines changed

18 files changed

+2
-313
lines changed

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Here I use Ansible to configure the following components:
1515
### Peering tunnels
1616

1717
- Wireguard via ifupdown: [roles/config-wireguard/](roles/config-wireguard/)
18-
- OpenVPN (2.5.x): [roles/config-openvpn/](roles/config-openvpn/)
1918
- GRE (plain) via ifupdown: [roles/config-gre-plain/](roles/config-gre-plain/)
2019

2120
### Services and daemons

reconfigure.yml

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
dummy_iface: "{{ dummy_interfaces.igp }}"
1212
when: "'igp' in dummy_interfaces"
1313
- config-wireguard
14-
- config-openvpn
1514
- config-gre-plain
1615
- config-igpping
1716
- config-bird2

roles/config-bird2/config/dn42_peers.conf.j2

-6
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ protocol bgp AS{{ peer_config.bgp.asn }}_v6 from dnpeers {
6565
{% endif %}
6666
{%- endfor -%}
6767

68-
{%- for ovpn_peer in ovpn_peers|default([]) -%}
69-
{% if not ovpn_peer.get('remove') and ovpn_peer.get('bgp') %}
70-
{{ dn42_peer(ovpn_peer, 33) }}
71-
{% endif %}
72-
{%- endfor -%}
73-
7468
{% for gre_peer in gre_peers|default([]) -%}
7569
{% if not gre_peer.get('remove') and gre_peer.get('bgp') %}
7670
{{ dn42_peer(gre_peer, 31) }}

roles/config-bird2/tasks/main.yml

-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
file: "roles/config-wireguard/config/{{ inventory_hostname }}.yml"
3434
ignore_errors: true
3535

36-
- name: Read OpenVPN tunnel settings
37-
include_vars:
38-
file: "roles/config-openvpn/config/{{ inventory_hostname }}.yml"
39-
ignore_errors: true
40-
4136
- name: Read GRE tunnel settings
4237
include_vars:
4338
file: "roles/config-gre-plain/config/{{ inventory_hostname }}.yml"

roles/config-iptables/tasks/main.yml

-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
file: "{{ playbook_dir }}/roles/config-wireguard/config/{{ inventory_hostname }}.yml"
1010
ignore_errors: true
1111

12-
- name: Read OpenVPN settings for peers
13-
include_vars:
14-
file: "{{ playbook_dir }}/roles/config-openvpn/config/{{ inventory_hostname }}.yml"
15-
ignore_errors: true
16-
1712
- name: Read GRE settings for peers
1813
include_vars:
1914
file: "{{ playbook_dir }}/roles/config-gre-plain/config/{{ inventory_hostname }}.yml"

roles/config-iptables/templates/rules.j2

-9
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,6 @@
3838
{{ _maybe_forward_rule(wg_peer) }}
3939
{%- endfor %}
4040

41-
## OpenVPN peers
42-
{% for ovpn_peer in ovpn_peers|default([]) -%}
43-
{%- if ovpn_peer.get('port') -%}
44-
# {{ ovpn_peer.name }}
45-
-A INPUT -p {{ 'tcp' if ovpn_peer.get('proto', 'udp').startswith('tcp') else 'udp' }} --dport {{ ovpn_peer['port'] }} -i {{ ansible_default_ipv4.interface }} -j ACCEPT
46-
{% endif -%}
47-
{{ _maybe_forward_rule(ovpn_peer) }}
48-
{%- endfor %}
49-
5041
{% if gre_peers | default([]) | length > 0 -%}
5142
## GRE peers
5243
-A INPUT -p gre -j ACCEPT

roles/config-openvpn/config/hkg.yml

-14
This file was deleted.

roles/config-openvpn/config/keys/dn42-icez.key

-37
This file was deleted.

roles/config-openvpn/config/keys/dn42-scoopta.key

-37
This file was deleted.

roles/config-openvpn/config/sjc.yml

-3
This file was deleted.

roles/config-openvpn/tasks/main.yml

-55
This file was deleted.

roles/config-openvpn/tasks/ovpn-remove.yml

-32
This file was deleted.

roles/config-openvpn/tasks/ovpn-update.yml

-32
This file was deleted.

roles/config-openvpn/templates/openvpn.conf.j2

-72
This file was deleted.

roles/setup-base/tasks/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
- tcpdump
1414

1515
- bird2
16-
- openvpn
1716
- wireguard
1817
# needed to use ansible become on an unprivileged user: https://docs.ansible.com/ansible/latest/user_guide/become.html#risks-of-becoming-an-unprivileged-user
1918
- acl

scripts/rename-node.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ set -x
1616
sed -i "s/$oldname/$newname/g" global-config/igp-tunnels.yml hosts.yml
1717
sed -i -E "s/(cleanup_remove_ifaces: \[.*)\]/\1,igp-$oldname\]/" global-config/general.yml
1818
mv -i "roles/config-bird2/config/peers/$oldname" "roles/config-bird2/config/peers/$newname"
19-
for vpn in "wireguard" "gre" "openvpn"; do
19+
for vpn in "wireguard" "gre"; do
2020
if [[ -f "roles/config-$vpn/config/$oldname.yml" ]]; then
2121
mv -i "roles/config-$vpn/config/$oldname.yml" "roles/config-$vpn/config/$newname.yml"
2222
fi

web/nodes.html.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<span class="info-success">(Clearnet dual-stack)</span>
3939
{% endif %}
4040
</li>
41-
<li><strong>WireGuard / OpenVPN port</strong>: 20000 + last 4 digits of your ASN</li>
41+
<li><strong>WireGuard port</strong>: 20000 + last 4 digits of your ASN</li>
4242
<li><strong>WireGuard pubkey</strong>: {{ serverdata.wg_pubkey }}</li>
4343
<li><strong>Tunneled IPv4 address</strong>: {{ serverdata.ownip }}</li>
4444
<li><strong>Tunneled IPv6 address</strong>: {{ serverdata.link_local_ip6 }} (link-local) OR {{ serverdata.ownip6 }}</li>

web/peering.html.j2

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<p>For consistency, I prefer multiprotocol BGP sessions over IPv6. For WireGuard + BIRD users, I recommend using link-local IPv6 addresses. For others, prefer ULA IPv6 addresses to work around various compatibility issues.</p>
2323
<p>If you have multiple nodes, especially in multiple continents, <b>please set up one peering per region to avoid traffic making unnecessary detours</b>.</p>
2424
<p>Note: configuration for this network is stored in a public <a href="https://github.com/jlu5/ansible-dn42">Git repository</a>. If you would like to keep your endpoint info private, please let me know when submitting your peering request, or simply leave it empty (disables outgoing connections from my end).</p>
25-
<p>OpenVPN peers should send me their keys via Matrix E2EE, PGP-encrypted mail (<a href="https://keys.openpgp.org/search?q=D5D568B2D34AB32A337944D22EC3F60DE71C0B9D">D5D568B2D34AB32A337944D22EC3F60DE71C0B9D</a>), or some other secure medium.</p>
2625
<p>Extended next hops (IPv4 over IPv6) are supported but <em>not</em> enabled by default.</p>
2726

2827
<h2 id="contact-info">

0 commit comments

Comments
 (0)