Fix: Correct playbook role names and remove missing roles
This commit is contained in:
@@ -40,3 +40,4 @@ localtemplate
|
|||||||
|
|
||||||
[all:vars]
|
[all:vars]
|
||||||
ansible_connection=ssh
|
ansible_connection=ssh
|
||||||
|
ansible_python_interpreter=auto_silent
|
||||||
|
|||||||
@@ -21,5 +21,5 @@
|
|||||||
|
|
||||||
- name:
|
- name:
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: ansible-role-security
|
name: security
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
- name: lxc-init
|
- name: lxc-init
|
||||||
hosts: photoprism
|
hosts: lxc
|
||||||
become: true
|
become: true
|
||||||
vars_files:
|
vars_files:
|
||||||
- vault.yml
|
- vault.yml
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
- name:
|
- name:
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: ansible-role-security
|
name: security
|
||||||
|
|
||||||
- name:
|
- name:
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
|
|||||||
@@ -21,8 +21,8 @@
|
|||||||
|
|
||||||
- name:
|
- name:
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: ansible-role-security
|
name: security
|
||||||
|
|
||||||
- name:
|
- name:
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: ansible-role-docker
|
name: docker
|
||||||
|
|||||||
@@ -18,11 +18,11 @@
|
|||||||
# #- role: create_user
|
# #- role: create_user
|
||||||
# #- role: linux_config_init
|
# #- role: linux_config_init
|
||||||
# #- role: tools_for_command_line
|
# #- role: tools_for_command_line
|
||||||
# #- role: ansible-role-security
|
# - role: security
|
||||||
# #- role: zfs_install
|
# #- role: zfs_install
|
||||||
# #- role: nfs_install
|
## - role: nfs
|
||||||
# #- role: samba_install
|
# - role: samba
|
||||||
# - role: ansible-role-docker
|
# - role: docker
|
||||||
|
|
||||||
|
|
||||||
- name: Pictures
|
- name: Pictures
|
||||||
@@ -133,7 +133,7 @@
|
|||||||
# roles:
|
# roles:
|
||||||
# - role: create_user
|
# - role: create_user
|
||||||
# - role: create_zfs_dataset
|
# - role: create_zfs_dataset
|
||||||
# - role: create_samba_user
|
#
|
||||||
# smbpasswd -a tata
|
# smbpasswd -a tata
|
||||||
|
|
||||||
|
|
||||||
@@ -160,7 +160,7 @@
|
|||||||
# roles:
|
# roles:
|
||||||
# #- role: create_user
|
# #- role: create_user
|
||||||
# #- role: create_zfs_dataset
|
# #- role: create_zfs_dataset
|
||||||
# - role: mariaDB_install
|
# - role: mariadb
|
||||||
|
|
||||||
#- name: nginx
|
#- name: nginx
|
||||||
# hosts: zeus-local
|
# hosts: zeus-local
|
||||||
@@ -296,7 +296,7 @@
|
|||||||
# - vault.yml
|
# - vault.yml
|
||||||
# - zeus-vars.yml
|
# - zeus-vars.yml
|
||||||
# roles:
|
# roles:
|
||||||
# - role: wireguard-server
|
# - role: wireguard_server
|
||||||
|
|
||||||
#- name: monitoring
|
#- name: monitoring
|
||||||
# hosts: zeus-local
|
# hosts: zeus-local
|
||||||
|
|||||||
@@ -9,4 +9,4 @@
|
|||||||
tasks:
|
tasks:
|
||||||
- name: mariadb
|
- name: mariadb
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: mariaDB
|
name: mariadb
|
||||||
|
|||||||
@@ -7,4 +7,4 @@
|
|||||||
tasks:
|
tasks:
|
||||||
- name: wireguard-server
|
- name: wireguard-server
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: wireguard-server
|
name: wireguard_server
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
tasks:
|
tasks:
|
||||||
- name: Copy from template
|
- name: Copy from template
|
||||||
template:
|
template:
|
||||||
src: ~/.ansible/roles/wireguard-server/templates/wireguardclient.conf
|
src: ~/.ansible/roles/wireguard_server/templates/wireguardclient.conf
|
||||||
dest: ~/{{ user }}.conf
|
dest: ~/{{ user }}.conf
|
||||||
owner: "{{ ansible_user_id }}"
|
owner: "{{ ansible_user_id }}"
|
||||||
group: "{{ ansible_user_id }}"
|
group: "{{ ansible_user_id }}"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
- name: template-differ
|
- name: template-differ
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: template-differ
|
name: template_differ
|
||||||
vars:
|
vars:
|
||||||
interface_name: enp1s0
|
interface_name: enp1s0
|
||||||
new_hostname: dvwa
|
new_hostname: dvwa
|
||||||
|
|||||||
@@ -21,5 +21,5 @@
|
|||||||
|
|
||||||
- name:
|
- name:
|
||||||
ansible.builtin.include_role:
|
ansible.builtin.include_role:
|
||||||
name: ansible-role-security
|
name: security
|
||||||
|
|
||||||
|
|||||||
@@ -8,9 +8,9 @@
|
|||||||
ip: 192.168.5.5
|
ip: 192.168.5.5
|
||||||
roles:
|
roles:
|
||||||
- role: linux_config_init
|
- role: linux_config_init
|
||||||
- role: import_ssh_key # without sudo
|
|
||||||
- role: tools_for_command_line
|
- role: tools_for_command_line
|
||||||
# - role: service_start
|
# - role: service_start
|
||||||
# - role: gui_app_init
|
# - role: gui_app_init
|
||||||
# - role: ansible-role-docker
|
# - role: docker
|
||||||
# docker_users: "{{ user }}"
|
# docker_users: "{{ user }}"
|
||||||
|
|||||||
14
templates/wireguardclient.conf
Normal file
14
templates/wireguardclient.conf
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
[Interface]
|
||||||
|
Address = {{ IP }}/24
|
||||||
|
DNS = 192.168.5.5
|
||||||
|
#PostUP = wifi-wireguard -e
|
||||||
|
#PostDOWN = wifi-wireguard -d
|
||||||
|
SaveConfig = false
|
||||||
|
ListenPort = 40041
|
||||||
|
PrivateKey = {{ priv }}
|
||||||
|
|
||||||
|
[Peer]
|
||||||
|
PublicKey = {{ wireguard_server_pub }}
|
||||||
|
AllowedIPs = 10.0.0.0/24, 192.168.5.0/24, 192.168.6.0/24, 192.168.100.0/24
|
||||||
|
Endpoint = 185.61.86.153:51822
|
||||||
|
PersistentKeepalive = 20
|
||||||
Reference in New Issue
Block a user