From bb0b2f607e16570643ecf7e77533618886113fda Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Mon, 25 Nov 2024 14:15:19 +0100 Subject: [PATCH] Linting und Arbeit an Extraction nach Kommsafe --- .ansible-lint | 3 ++- extraction.yml | 38 ++++++++++++++++++++++++++++++++ files/testfile.txt | 1 + inventory/testserver.ini | 5 ++++- update.yml | 13 +++++------ webserver-tls.yml | 11 +++++----- webserver.yml | 47 ++++++++++++++++++++-------------------- 7 files changed, 80 insertions(+), 38 deletions(-) create mode 100644 extraction.yml create mode 100644 files/testfile.txt diff --git a/.ansible-lint b/.ansible-lint index 6c38410..12bf9dd 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,2 +1,3 @@ +--- skip_list: - - 'fqcn-builtins' \ No newline at end of file + - "fqcn-builtins" diff --git a/extraction.yml b/extraction.yml new file mode 100644 index 0000000..bca3d96 --- /dev/null +++ b/extraction.yml @@ -0,0 +1,38 @@ +--- +- name: WebDAV Freigabe einbinden + hosts: webdav_testserver + become: true + tasks: + - name: DavFS2 installieren + apt: + name: davfs2 + state: present + + - name: Benutzerrechte für davfs2 einrichten + lineinfile: + path: /etc/fstab + line: "{{ webdav_url }} {{ mount_point }} davfs rw,user,noauto 0 0" + state: present + + - name: WebDAV-Zugangsdaten hinzufügen + copy: + dest: /etc/davfs2/secrets + content: | + {{ webdav_url }} {{ webdav_user }} {{ webdav_password }} + owner: root + group: root + mode: "0600" + + - name: Mount-Punkt erstellen + file: + path: "{{ mount_point }}" + state: directory + mode: "0755" + + - name: WebDAV Freigabe einbinden + ansible.posix.mount: + path: "{{ mount_point }}" + src: "{{ webdav_url }}" + fstype: davfs + opts: rw,user,noauto + state: mounted diff --git a/files/testfile.txt b/files/testfile.txt new file mode 100644 index 0000000..0025b93 --- /dev/null +++ b/files/testfile.txt @@ -0,0 +1 @@ +Testen wir ob es Funktioniert \ No newline at end of file diff --git a/inventory/testserver.ini b/inventory/testserver.ini index 0a3ab21..0a02918 100644 --- a/inventory/testserver.ini +++ b/inventory/testserver.ini @@ -7,4 +7,7 @@ ansible_port = 22 ansible_private_key_file = keys/id_ed25519 [webserver] -linuxerver \ No newline at end of file +linuxerver + +[webdav_testserver] +Tim-TT-01.kitl.bayern \ No newline at end of file diff --git a/update.yml b/update.yml index 36815b7..0aef172 100644 --- a/update.yml +++ b/update.yml @@ -3,11 +3,10 @@ hosts: linuxservers become: true tasks: - - name: Update and Upgrade System - apt: - update_cache: true - upgrade: true + - name: Update and Upgrade System + apt: + update_cache: true + upgrade: true - - name: Reboot System - reboot: -... + - name: Reboot System + reboot: diff --git a/webserver-tls.yml b/webserver-tls.yml index ddbd826..195a0d7 100644 --- a/webserver-tls.yml +++ b/webserver-tls.yml @@ -1,3 +1,4 @@ +--- - name: Configure webserver with Nginx and TLS hosts: webservers become: true @@ -26,14 +27,14 @@ file: path: "{{ tls_dir }}" state: directory - mode: '0750' + mode: "0750" notify: Restart nginx - name: Copy TLS files copy: src: "{{ item }}" dest: "{{ tls_dir }}" - mode: '0600' + mode: "0600" loop: - "{{ key_file }}" - "{{ cert_file }}" @@ -43,7 +44,7 @@ template: src: nginx.conf.j2 dest: "{{ conf_file }}" - mode: '0644' + mode: "0644" notify: Restart nginx - name: Enable configuration @@ -56,7 +57,7 @@ template: src: index.html.j2 dest: /usr/share/nginx/html/index.html - mode: '0644' + mode: "0644" - name: Restart nginx meta: flush_handlers @@ -65,7 +66,7 @@ delegate_to: localhost become: false uri: - url: 'https://192.168.62.160/index.html' + url: "https://192.168.62.160/index.html" validate_certs: false return_content: true register: this diff --git a/webserver.yml b/webserver.yml index 37049fc..7a01ee5 100644 --- a/webserver.yml +++ b/webserver.yml @@ -3,31 +3,30 @@ hosts: webservers become: true tasks: - - name: Ensure nginx is installed - package: - name: nginx - update_cache: true + - name: Ensure nginx is installed + package: + name: nginx + update_cache: true - - name: Copy nginx config file - copy: - src: nginx.conf - dest: /etc/nginx/sites-available/default - mode: "0640" + - name: Copy nginx config file + copy: + src: nginx.conf + dest: /etc/nginx/sites-available/default + mode: "0640" - - name: Enable Configuration - file: - src: /etc/nginx/sites-available/default - dest: /etc/nginx/sites-enabled/default - state: link + - name: Enable Configuration + file: + src: /etc/nginx/sites-available/default + dest: /etc/nginx/sites-enabled/default + state: link - - name: Copy index.html - template: - src: index.html.j2 - dest: /usr/share/nginx/html/index.html - mode: "0640" + - name: Copy index.html + template: + src: index.html.j2 + dest: /usr/share/nginx/html/index.html + mode: "0640" - - name: Restart nginx - service: - name: nginx - state: restarted -... + - name: Restart nginx + service: + name: nginx + state: restarted