1
0
Fork 0
mirror of https://github.com/DO1JLR/ansible_linux_desktop_setup.git synced 2024-09-14 19:54:51 +02:00

Update modules and openvpn

This commit is contained in:
L3D 2023-10-28 23:19:14 +02:00
parent a490e03242
commit d9e836f87b
No known key found for this signature in database
GPG key ID: AD65B920933B4B20
15 changed files with 66 additions and 98 deletions

20
.gitmodules vendored
View file

@ -1,7 +1,3 @@
[submodule "roles/workstation_packages"]
path = roles/workstation_packages
url = https://github.com/chaos-bodensee/role_install_workstaton_packages.git
branch = master
[submodule "roles/dotfiles"] [submodule "roles/dotfiles"]
path = roles/dotfiles path = roles/dotfiles
url = https://github.com/roles-ansible/ansible_role_dotfiles.git url = https://github.com/roles-ansible/ansible_role_dotfiles.git
@ -22,26 +18,10 @@
path = roles/do1jlr.sshd path = roles/do1jlr.sshd
url = https://github.com/roles-ansible/ansible_role_sshd.git url = https://github.com/roles-ansible/ansible_role_sshd.git
branch = main branch = main
[submodule "roles/nextcloud"]
path = roles/nextcloud
url = https://github.com/DO1JLR/role_nextcloud_client.git
branch = master
[submodule "roles/arch-fonts"]
path = roles/arch-fonts
url = https://github.com/chaos-bodensee/role-arch-fonts.git
branch = master
[submodule "roles/akku-warning"] [submodule "roles/akku-warning"]
path = roles/akku-warning path = roles/akku-warning
url = https://github.com/roles-ansible/role_akku_warning.git url = https://github.com/roles-ansible/role_akku_warning.git
branch = main branch = main
[submodule "roles/install-firefox"]
path = roles/install-firefox
url = https://github.com/roles-ansible/ansible_role_install_firefox.git
branch = main
[submodule "roles/xrandr"]
path = roles/xrandr
url = https://github.com/roles-ansible/ansible_role_xrandr_help.git
branch = main
[submodule "roles/winehq"] [submodule "roles/winehq"]
path = roles/winehq path = roles/winehq
url = https://github.com/ekultails/ansible_role_wine.git url = https://github.com/ekultails/ansible_role_wine.git

@ -1 +0,0 @@
Subproject commit ed81782a5afa614e648b79b3fd1b1c53d1e86961

View file

@ -1,2 +0,0 @@
---
copy_to_user: "{{ ansible_user_id }}"

View file

@ -1,11 +0,0 @@
---
- name: copy files
copy:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
with_items:
- { src: 'files/background.png', dest: "/home/{{ copy_to_user }}/.config/background.png" }
- { src: 'files/lockscreen.png', dest: '/home/{{ copy_to_user }}/.config/lockscreen.png' }
- { src: 'files/xinitrc', dest: '/home/{{ copy_to_user }}/.xinitrc' }

@ -1 +0,0 @@
Subproject commit 6b7d8d470f81f46a067f9ed05a2b69d6d7c7784c

@ -1 +1 @@
Subproject commit ee8044a7be41599fbf340fade4e4f4342413e456 Subproject commit 242529420b856b5923529e50652a9b2e553e1aca

@ -1 +0,0 @@
Subproject commit 7fdf73f58b81c3b49aa8dff4578b0ca2a4da81d7

View file

@ -0,0 +1,4 @@
---
collections:
- name: 'community.general'
version: ">=7.5.0,<=8.0.0"

View file

@ -0,0 +1,24 @@
---
- name: Run the equivalent of "pacman -Sy" as a separate step # noqa: H1901
become: true
community.general.pacman:
update_cache: true
when: ansible_os_family == 'Archlinux'
- name: Update Debian apt cache
become: true
ansible.builtin.apt:
cache_valid_time: 3600
update_cache: true
when:
- ansible_pkg_mgr == "apt"
- name: Install OpenVPN all
become: true
ansible.builtin.package:
name: "{{ item }}"
state: 'present'
loop:
- 'openvpn'
- 'bridge-utils'
- 'easy-rsa'

View file

@ -1,42 +1,12 @@
--- ---
- name: perform versionscheck - name: Perform versionscheck
ansible.builtin.include_tasks: versioncheck.yml ansible.builtin.include_tasks:
file: 'versioncheck.yml'
- name: Run the equivalent of "pacman -Syu" as a separate step - name: Install openvpn packages
become: true ansible.builtin.include_tasks:
ansible.builtin.pacman: file: 'install.yml'
update_cache: true
upgrade: true
when: ansible_os_family == 'Archlinux'
- name: Install OpenVPN for ArchLinux - name: Make sure openvpn modules are present
become: true ansible.builtin.include_tasks:
ansible.builtin.pacman: file: 'modprobe.yml'
name:
- openvpn
- bridge-utils
- easy-rsa
state: present
when: ansible_os_family == 'Archlinux'
- name: Install OpenVPN all
become: true
ansible.builtin.package:
name:
- openvpn
- bridge-utils
- easy-rsa
state: present
when: ansible_os_family != 'Archlinux'
- name: Add the tun module
become: true
community.general.modprobe:
name: tun
state: present
- name: Add the bridge module
become: true
community.general.modprobe:
name: bridge
state: present

View file

@ -0,0 +1,12 @@
---
- name: Add the tun module # noqa: H1901
become: true
community.general.modprobe:
name: 'tun'
state: 'present'
- name: Add the bridge module # noqa: H1901
become: true
community.general.modprobe:
name: 'bridge'
state: 'present'

View file

@ -1,41 +1,44 @@
--- ---
# Copyright (c) 2021 L3D <l3d@c3woc.de>
# this file is released with the MIT license.
# License: https://github.com/roles-ansible/ansible_role_template/blob/main/LICENSE
- name: Create directory for versionscheck - name: Create directory for versionscheck
become: true become: true
ansible.builtin.file: ansible.builtin.file:
path: '/etc/.ansible-version' path: '/etc/.ansible-version'
state: directory state: directory
mode: 0755 mode: '0755'
when: submodules_versioncheck | bool
- name: check playbook version - name: Check playbook version
become: true become: true
ansible.builtin.slurp: ansible.builtin.slurp:
src: "/etc/.ansible-version/{{ playbook_version_path }}" src: "/etc/.ansible-version/{{ playbook_version_path }}"
register: playbook_version register: playbook_version
ignore_errors: true when: submodules_versioncheck | bool
failed_when: false failed_when: false
- name: Print remote role version - name: Print remote role version # noqa: H500
ansible.builtin.debug: ansible.builtin.debug:
msg: "Remote role version: {{ playbook_version.content | default('Y3VycmVudGx5IG5vdCBkZXBsb3llZAo=') | b64decode | string }}" msg: "Remote role version: {{ playbook_version.content | default('Y3VycmVudGx5IG5vdCBkZXBsb3llZAo=') | b64decode | string }}"
when: submodules_versioncheck | bool
- name: Print locale role version - name: Print locale role version # noqa: H500
ansible.builtin.debug: ansible.builtin.debug:
msg: "Local role version: '{{ playbook_version_number|string }}'." msg: "Local role version: '{{ playbook_version_number | string }}'."
when: submodules_versioncheck | bool
- name: Check if your version is outdated - name: Check if your version is outdated
ansible.builtin.fail: ansible.builtin.fail:
msg: "Your ansible module has the version '{{ playbook_version_number }}' and is outdated. You need to update it!" msg: "Your ansible module has the version '{{ playbook_version_number }}' and is outdated. You need to update it!"
when: when:
- playbook_version.content|default("Mgo=")|b64decode|int - 1 >= playbook_version_number|int and submodules_versioncheck|bool - playbook_version.content|default("Mgo=")|b64decode|int - 1 >= playbook_version_number|int and submodules_versioncheck | bool
- name: check if '/etc/ansible-version/' is empty - name: Write new version to remote disk
ansible.builtin.find:
paths: '/etc/ansible-version/'
register: filesFound
- name: write new version to remote disk
become: true become: true
ansible.builtin.copy: ansible.builtin.copy:
content: "{{ playbook_version_number }}" content: "{{ playbook_version_number }}"
dest: "/etc/.ansible-version/{{ playbook_version_path }}" dest: "/etc/.ansible-version/{{ playbook_version_path }}"
mode: '0644' mode: '0644'
when: submodules_versioncheck | bool
tags: skip_ansible_lint_template-instead-of-copy

@ -1 +0,0 @@
Subproject commit 99bcb120fe5020e257c4dddad20f04d215b1eed7

@ -1 +0,0 @@
Subproject commit 445e76ea5ced8b265b3ce3a9720cb65c6378136f

View file

@ -8,13 +8,11 @@
hosts: all hosts: all
roles: roles:
- {role: l3d.packages, tags: [packages, apt]} - {role: l3d.packages, tags: [packages, apt]}
# - {role: workstation_packages, tags: [default, workstation_packages, packages, setup]}
- {role: l3d.ntp, tags: ntp} - {role: l3d.ntp, tags: ntp}
- {role: l3d.avahi.client, tags: avahi} - {role: l3d.avahi.client, tags: avahi}
- {role: l3d.avahi.daemon, tags: avahi} - {role: l3d.avahi.daemon, tags: avahi}
- {role: l3d.etesync_dav, tags: [etebase, etesync, dav]} - {role: l3d.etesync_dav, tags: [etebase, etesync, dav]}
- {role: gantsign.bat, tags: bat} - {role: gantsign.bat, tags: bat}
# - {role: arch-fonts, tags: [font, fonts, arch-fonts]}
- {role: l3d.gopass, tags: gopass} - {role: l3d.gopass, tags: gopass}
- {role: do1jlr.i3wm, tags: i3wm} - {role: do1jlr.i3wm, tags: i3wm}
@ -28,11 +26,6 @@
# - {role: akku-warning, tags: [akku, akku_warning, akku-warning]} # - {role: akku-warning, tags: [akku, akku_warning, akku-warning]}
# - {role: pulseaudio, tags: pulseaudio} # - {role: pulseaudio, tags: pulseaudio}
# - {role: networkmanager, tags: [nm, networkmanager]} # - {role: networkmanager, tags: [nm, networkmanager]}
# - {role: copy_files}
# - {role: do1jlr.i3wm, tags: i3wm}
# - {role: xrandr, tags: xrandr}
# - {role: install-firefox, tags: firefox}
# - {role: nextcloud, tags: nextcloud}
# - {role: openvpn, tags: openvpn} # - {role: openvpn, tags: openvpn}
# - {role: winehq, tags: [wine, winehq]} # - {role: winehq, tags: [wine, winehq]}
# - {role: no-sleep, tags: no_sleep} # - {role: no-sleep, tags: no_sleep}