Compare commits
31 Commits
role_kuber
...
role_wireg
| Author | SHA1 | Date | |
|---|---|---|---|
| ab9220d042 | |||
| 7012e1ea2b | |||
| 13ebd48c5d | |||
| 1a76b94a46 | |||
| 1b765689e6 | |||
| 5b607df2de | |||
| 521b76453a | |||
| 7f503d983a | |||
| b143d9c848 | |||
| f95bcbc38d | |||
| 248a3c08b8 | |||
| f2c86dc22d | |||
| a79f2cac8a | |||
| fd302e4ebc | |||
| b5729caa0e | |||
| dca40ed835 | |||
| 95ddd04a86 | |||
| 911bc47acb | |||
| f3e381aca3 | |||
| 233eadaf40 | |||
| 109a09052d | |||
| 4ea9492ca3 | |||
| e5ebc2ad5f | |||
| 98c51c6fc1 | |||
| 6b59bf6c75 | |||
| 1b2af7cf6c | |||
| d9cf3d2066 | |||
| f42bce9b6b | |||
| 975746e7d7 | |||
| a27ca2c37a | |||
| 247fdec7ae |
3
_deprecated/netmaker/meta/main.yml
Normal file
3
_deprecated/netmaker/meta/main.yml
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
dependencies: []
|
||||||
|
#- role: docker
|
||||||
@@ -2,4 +2,6 @@
|
|||||||
when: "netclient.join_network_token is defined"
|
when: "netclient.join_network_token is defined"
|
||||||
command: "netclient join -t {{ netclient.join_network_token }}"
|
command: "netclient join -t {{ netclient.join_network_token }}"
|
||||||
failed_when: command.rc != 0
|
failed_when: command.rc != 0
|
||||||
|
changed_when: "'starting wireguard' in command.stdout"
|
||||||
register: command
|
register: command
|
||||||
|
throttle: 1
|
||||||
8
_deprecated/netmaker/tasks/main.yml
Normal file
8
_deprecated/netmaker/tasks/main.yml
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
- import_tasks: ./certs.yml
|
||||||
|
|
||||||
|
- import_tasks: ./install.yml
|
||||||
|
|
||||||
|
- import_tasks: ./join-network.yml
|
||||||
|
|
||||||
|
- name: Gather facts to get changes
|
||||||
|
ansible.builtin.gather_facts:
|
||||||
@@ -30,7 +30,7 @@ component netmaker_server {
|
|||||||
component nm_api
|
component nm_api
|
||||||
nm_api -down- nm_api_http
|
nm_api -down- nm_api_http
|
||||||
ng_http --( nm_api_http
|
ng_http --( nm_api_http
|
||||||
nm_api -up-( ng_TLS : db-connection to rqlite-master
|
nm_api .up.( ng_TLS : db-connection to rqlite-master
|
||||||
nm_api --( mq_plain
|
nm_api --( mq_plain
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
per_listener_settings false
|
per_listener_settings false
|
||||||
|
|
||||||
listener 8883
|
listener 8883
|
||||||
|
protocol websockets
|
||||||
allow_anonymous false
|
allow_anonymous false
|
||||||
certfile /certs/node.crt
|
|
||||||
keyfile /certs/node.key
|
|
||||||
|
|
||||||
listener 1883
|
listener 1883
|
||||||
|
protocol websockets
|
||||||
allow_anonymous false
|
allow_anonymous false
|
||||||
|
|
||||||
plugin /usr/lib/mosquitto_dynamic_security.so
|
plugin /usr/lib/mosquitto_dynamic_security.so
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
headers:
|
headers:
|
||||||
Authorization: 'Bearer {{ netmaker_creds.master_key }}'
|
Authorization: 'Bearer {{ netmaker_creds.master_key }}'
|
||||||
Content-Type: application/json
|
Content-Type: application/json
|
||||||
when: "inventory_hostname == groups['netmaker'][0]"
|
when: "inventory_hostname == groups['netmaker_server'][0]"
|
||||||
register: default_mesh
|
register: default_mesh
|
||||||
until: "default_mesh is not failed"
|
until: "default_mesh is not failed"
|
||||||
retries: 2
|
retries: 2
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
headers:
|
headers:
|
||||||
Authorization: 'Bearer {{ netmaker_creds.master_key }}'
|
Authorization: 'Bearer {{ netmaker_creds.master_key }}'
|
||||||
Content-Type: application/json
|
Content-Type: application/json
|
||||||
when: "inventory_hostname == groups['netmaker'][0]"
|
when: "inventory_hostname == groups['netmaker_server'][0]"
|
||||||
register: default_mesh_key
|
register: default_mesh_key
|
||||||
until: "default_mesh_key is not failed"
|
until: "default_mesh_key is not failed"
|
||||||
retries: 2
|
retries: 2
|
||||||
@@ -33,15 +33,15 @@ services:
|
|||||||
|
|
||||||
-auth /config.json
|
-auth /config.json
|
||||||
|
|
||||||
{% if inventory_hostname != groups['netmaker'][0] %}
|
{% if inventory_hostname != groups['netmaker_server'][0] %}
|
||||||
-join-as netmaker
|
-join-as netmaker
|
||||||
-join https://{{ netmaker_rqlite.http_host }}.{{ groups['netmaker'][0] }}:{{ netmaker_nginx.advertise_port }}
|
-join https://{{ netmaker_rqlite.http_host }}.{{ groups['netmaker_server'][0] }}:{{ netmaker_nginx.advertise_port }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
"
|
"
|
||||||
# FIXME: /\ \/ Change http -> https
|
# FIXME: /\ \/ Change http -> https
|
||||||
|
|
||||||
netmaker: # The Primary Server for running Netmaker
|
netmaker: # The Primary Server for running Netmaker
|
||||||
image: gravitl/netmaker:v0.16.1
|
image: gravitl/netmaker:v0.17.1
|
||||||
depends_on:
|
depends_on:
|
||||||
- rqlite
|
- rqlite
|
||||||
cap_add:
|
cap_add:
|
||||||
@@ -104,7 +104,7 @@ services:
|
|||||||
- "51821-51830:51821-51830/udp" # wireguard ports
|
- "51821-51830:51821-51830/udp" # wireguard ports
|
||||||
|
|
||||||
netmaker-ui: # The Netmaker UI Component
|
netmaker-ui: # The Netmaker UI Component
|
||||||
image: gravitl/netmaker-ui:v0.16.1
|
image: gravitl/netmaker-ui:v0.17.1
|
||||||
depends_on:
|
depends_on:
|
||||||
- netmaker
|
- netmaker
|
||||||
links:
|
links:
|
||||||
@@ -120,7 +120,6 @@ services:
|
|||||||
- ./mosquitto/config:/mosquitto/config
|
- ./mosquitto/config:/mosquitto/config
|
||||||
- ./mosquitto/data:/mosquitto/data
|
- ./mosquitto/data:/mosquitto/data
|
||||||
- ./mosquitto/logs:/mosquitto/log
|
- ./mosquitto/logs:/mosquitto/log
|
||||||
- "./certs:/certs:ro"
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- netmaker
|
- netmaker
|
||||||
command: ["/mosquitto/config/wait.sh"]
|
command: ["/mosquitto/config/wait.sh"]
|
||||||
@@ -6,7 +6,7 @@ stream{
|
|||||||
{{ netmaker_ui.host }}.{{ netmaker_base_domain }} 127.0.0.1:8443;
|
{{ netmaker_ui.host }}.{{ netmaker_base_domain }} 127.0.0.1:8443;
|
||||||
{{ netmaker_api.host }}.{{ netmaker_base_domain }} 127.0.0.1:8443;
|
{{ netmaker_api.host }}.{{ netmaker_base_domain }} 127.0.0.1:8443;
|
||||||
|
|
||||||
{{ netmaker_broker.tls_host }}.{{ netmaker_base_domain }} mosquitto:8883; # todo: tls-terminate?
|
{{ netmaker_broker.tls_host }}.{{ netmaker_base_domain }} 127.0.0.1:8443;
|
||||||
|
|
||||||
{{ netmaker_rqlite.http_host }}.{{ ansible_facts.nodename }} 127.0.0.1:8443;
|
{{ netmaker_rqlite.http_host }}.{{ ansible_facts.nodename }} 127.0.0.1:8443;
|
||||||
{{ netmaker_rqlite.cluster_host }}.{{ ansible_facts.nodename }} rqlite:4002;
|
{{ netmaker_rqlite.cluster_host }}.{{ ansible_facts.nodename }} rqlite:4002;
|
||||||
@@ -3,7 +3,9 @@ map $host $proxy_name {
|
|||||||
|
|
||||||
{{ netmaker_ui.host }}.{{ netmaker_base_domain }} netmaker-ui:80;
|
{{ netmaker_ui.host }}.{{ netmaker_base_domain }} netmaker-ui:80;
|
||||||
{{ netmaker_api.host }}.{{ netmaker_base_domain }} netmaker:8081;
|
{{ netmaker_api.host }}.{{ netmaker_base_domain }} netmaker:8081;
|
||||||
|
|
||||||
|
{{ netmaker_broker.tls_host }}.{{ netmaker_base_domain }} mosquitto:8883;
|
||||||
|
|
||||||
{{ netmaker_rqlite.http_host }}.{{ ansible_facts.nodename }} rqlite:4001;
|
{{ netmaker_rqlite.http_host }}.{{ ansible_facts.nodename }} rqlite:4001;
|
||||||
|
|
||||||
default 444;
|
default 444;
|
||||||
1
common/defaults/main.yml
Normal file
1
common/defaults/main.yml
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ipv6_stable_secret: 1111:2222:3333:4444:5555:6666:7777:8888
|
||||||
@@ -5,3 +5,5 @@
|
|||||||
- import_tasks: ./packages.yml
|
- import_tasks: ./packages.yml
|
||||||
|
|
||||||
- import_tasks: ./aliases.yml
|
- import_tasks: ./aliases.yml
|
||||||
|
|
||||||
|
- import_tasks: ./networking.yml
|
||||||
|
|||||||
22
common/tasks/networking.yml
Normal file
22
common/tasks/networking.yml
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
- name: Set sysctl settings for ip-forwarding
|
||||||
|
copy:
|
||||||
|
dest: "/etc/sysctl.d/ip-forwarding.conf"
|
||||||
|
content: |
|
||||||
|
net.ipv4.ip_forward = 1
|
||||||
|
net.ipv6.conf.all.forwarding = 1
|
||||||
|
notify: reload_sysctl
|
||||||
|
|
||||||
|
- name: Set sysctl settings for ipv6-address-generation
|
||||||
|
copy:
|
||||||
|
dest: "/etc/sysctl.d/ipv6-slaac-address-generation.conf"
|
||||||
|
content: |
|
||||||
|
net.ipv6.conf.default.addr_gen_mode = 2
|
||||||
|
net.ipv6.conf.default.stable_secret = {{ ipv6_stable_secret }}
|
||||||
|
notify: reload_sysctl
|
||||||
|
|
||||||
|
- name: Set sysctl settings to override ipv6-slaac with enabled forwarding
|
||||||
|
copy:
|
||||||
|
dest: "/etc/sysctl.d/ipv6-slaac-override.conf"
|
||||||
|
content: |
|
||||||
|
net.ipv6.conf.all.accept_ra = 2
|
||||||
|
notify: reload_sysctl
|
||||||
6
netbird_client/defaults/netbird_client.yml
Normal file
6
netbird_client/defaults/netbird_client.yml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
netbird_client:
|
||||||
|
# Key and url to join a network
|
||||||
|
# leave empty to ignore
|
||||||
|
join_network:
|
||||||
|
setup_key:
|
||||||
|
management_url:
|
||||||
26
netbird_client/tasks/install.yml
Normal file
26
netbird_client/tasks/install.yml
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
- name: Install Packages
|
||||||
|
# when: docker_file.stat.exists == False
|
||||||
|
package:
|
||||||
|
name:
|
||||||
|
- ca-certificates
|
||||||
|
- curl
|
||||||
|
- gnupg
|
||||||
|
|
||||||
|
- name: Add netbird-key
|
||||||
|
apt_key:
|
||||||
|
url: https://pkgs.wiretrustee.com/debian/public.key
|
||||||
|
state: present
|
||||||
|
|
||||||
|
- name: Add netbird-repository
|
||||||
|
apt_repository:
|
||||||
|
repo: "deb https://pkgs.wiretrustee.com/debian stable main"
|
||||||
|
state: present
|
||||||
|
filename: netbird
|
||||||
|
update_cache: yes
|
||||||
|
|
||||||
|
- name: Install wireguard & netbird
|
||||||
|
package:
|
||||||
|
name:
|
||||||
|
- wireguard
|
||||||
|
- netbird
|
||||||
|
state: latest
|
||||||
16
netbird_client/tasks/join-network.yml
Normal file
16
netbird_client/tasks/join-network.yml
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
- name: Join netbird-network
|
||||||
|
when: "netbird_client.join_network.setup_key is defined"
|
||||||
|
command: "netbird up --management-url {{ netbird_client.join_network.management_url }} --setup-key {{ netbird_client.join_network.setup_key }}"
|
||||||
|
failed_when: command.rc != 0
|
||||||
|
changed_when: "'Connected' in command.stdout"
|
||||||
|
register: command
|
||||||
|
|
||||||
|
- name: Wait for netbird-interface to exist
|
||||||
|
wait_for:
|
||||||
|
path: "/sys/class/net/wt0"
|
||||||
|
state: present
|
||||||
|
when: command.changed
|
||||||
|
|
||||||
|
- name: Gather facts to get changes
|
||||||
|
ansible.builtin.gather_facts:
|
||||||
|
when: command.changed
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
- import_tasks: ./certs.yml
|
|
||||||
|
|
||||||
- import_tasks: ./install.yml
|
- import_tasks: ./install.yml
|
||||||
|
|
||||||
- import_tasks: ./join-network.yml
|
- import_tasks: ./join-network.yml
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
---
|
|
||||||
dependencies:
|
|
||||||
- role: docker
|
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
wireguard_ipv6_converter:
|
||||||
|
version: latest
|
||||||
|
|
||||||
|
# see https://github.com/Ruakij/wg-ipv6-converter#31-environment
|
||||||
|
setup:
|
||||||
|
interface: wg0
|
||||||
|
#ipv6_format: fc12::%02x%02x:%02x%02x/%d
|
||||||
|
#filter_prefix: 100.100
|
||||||
|
#recheck_interval: 60s
|
||||||
|
|
||||||
|
service:
|
||||||
|
#bindTo: netbird.service
|
||||||
11
wireguard-ipv6-converter/tasks/deploy.yml
Normal file
11
wireguard-ipv6-converter/tasks/deploy.yml
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
- name: Get architecture
|
||||||
|
set_fact:
|
||||||
|
arch: "{{ 'amd64' if ansible_architecture == 'x86_64' else 'arm64' }}"
|
||||||
|
versionUri: "{% if wireguard_ipv6_converter.version == 'latest' %}latest/download{% else %}download/{{ wireguard_ipv6_converter.version }}{% endif %}"
|
||||||
|
|
||||||
|
- name: Download binary
|
||||||
|
get_url:
|
||||||
|
url: https://github.com/Ruakij/wg-ipv6-converter/releases/{{ versionUri }}/wg-ipv6-converter_{{ arch }}
|
||||||
|
dest: /usr/local/bin/wg-ipv6-converter
|
||||||
|
mode: "744"
|
||||||
|
register: deployDownload
|
||||||
3
wireguard-ipv6-converter/tasks/main.yml
Normal file
3
wireguard-ipv6-converter/tasks/main.yml
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
- import_tasks: ./deploy.yml
|
||||||
|
|
||||||
|
- import_tasks: ./setup-service.yml
|
||||||
27
wireguard-ipv6-converter/tasks/setup-service.yml
Normal file
27
wireguard-ipv6-converter/tasks/setup-service.yml
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
- name: Deploy service
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: wg-ipv6-conv.service.jinja2
|
||||||
|
dest: /etc/systemd/system/wg-ipv6-converter_{{ wireguard_ipv6_converter.setup.interface }}.service
|
||||||
|
register: serviceFile
|
||||||
|
|
||||||
|
- name: Enable service
|
||||||
|
ansible.builtin.service:
|
||||||
|
name: wg-ipv6-converter_{{ wireguard_ipv6_converter.setup.interface }}
|
||||||
|
daemon-reload: true
|
||||||
|
enabled: true
|
||||||
|
|
||||||
|
- name: Start service if interface exists already
|
||||||
|
ansible.builtin.service:
|
||||||
|
name: wg-ipv6-converter_{{ wireguard_ipv6_converter.setup.interface }}
|
||||||
|
state: "{{ 'restarted' if deployDownload.changed or serviceFile.changed else 'started' }}"
|
||||||
|
register: service
|
||||||
|
when: "wireguard_ipv6_converter.setup.interface in ansible_interfaces"
|
||||||
|
|
||||||
|
- name: Pause for 5s to wait for program to have run
|
||||||
|
ansible.builtin.pause:
|
||||||
|
seconds: 5
|
||||||
|
when: "service.changed"
|
||||||
|
|
||||||
|
- name: Gather facts to get changes
|
||||||
|
ansible.builtin.gather_facts:
|
||||||
|
when: "service.changed"
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=WireGuard IPv6 converter for {{ wireguard_ipv6_converter.setup.interface }}
|
||||||
|
{% if wireguard_ipv6_converter.service.bindTo is defined %}
|
||||||
|
BindsTo={{ wireguard_ipv6_converter.service.bindTo }}
|
||||||
|
After={{ wireguard_ipv6_converter.service.bindTo }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
{% if wireguard_ipv6_converter.service.bindTo is defined %}
|
||||||
|
ExecStartPre=/bin/sleep 10
|
||||||
|
{% endif %}
|
||||||
|
ExecStart=/usr/local/bin/wg-ipv6-converter
|
||||||
|
Restart=always
|
||||||
|
RestartSec=30
|
||||||
|
|
||||||
|
Environment="INTERFACE={{ wireguard_ipv6_converter.setup.interface }}"
|
||||||
|
{% if wireguard_ipv6_converter.setup.ipv6_format is defined %}
|
||||||
|
Environment="IPV6_FORMAT={{ wireguard_ipv6_converter.setup.ipv6_format }}"
|
||||||
|
{% endif %}
|
||||||
|
{% if wireguard_ipv6_converter.setup.filter_prefix is defined %}
|
||||||
|
Environment="FILTER_PREFIX={{ wireguard_ipv6_converter.setup.filter_prefix }}"
|
||||||
|
{% endif %}
|
||||||
|
{% if wireguard_ipv6_converter.setup.recheck_interval is defined %}
|
||||||
|
Environment="RECHECK_INTERVAL={{ wireguard_ipv6_converter.setup.recheck_interval }}"
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
Reference in New Issue
Block a user