Merge 096439b6bb678a6a65e778684da47c49c246055a into f76fcf2cc9dd0d7b2fbb45dd5f6dc43c8c0ae6b9

group_vars/all.yaml

@@ -3,10 +3,6 @@ timeout_blank: 1800
 timeout_lock: 30
 grub_timeout: 10
 
-ssh_keys:
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEm981GRiUIsp8e4bTDv+d9SyHfQ8P18W5oovgmAfnip em@x210
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDqmyaaIqRU9hx8PxRnIqe/pRANIxrEEscuMWrHZF1yh snowflake@flakeX230
-
 xbps_install:
   # General
   - htop
@@ -70,7 +66,7 @@ xbps_install:
   - asciiquarium
   - cbonsai
   - cmatrix
-  # - openarena
+  - openarena
   # GNOME
   # A custom list intead of `gnome-apps` meta package
   - eog

roles/bakalari/defaults/main.yaml

@@ -0,0 +1,4 @@
+bakalari_desktop_src: bakalari.desktop
+bakalari_desktop_dest: /usr/share/applications/bakalari.desktop
+bakalari_icon_src: bakalari.png
+bakalari_icon_dest: /usr/share/icons/bakalari.png

roles/bakalari/tasks/main.yaml

@@ -0,0 +1,21 @@
+- name: Ensure the applications directory exists
+  file:
+    path: /usr/share/applications
+    state: directory
+
+- name: Ensure the icons directory exists
+  file:
+    path: /usr/share/icons
+    state: directory
+
+- name: Copy Bakaláři desktop shortcut
+  copy:
+    src: bakalari.desktop
+    dest: /usr/share/applications/bakalari.desktop
+    mode: 0644
+
+- name: Copy Bakaláři icon
+  copy:
+    src: bakalari.png
+    dest: /usr/share/icons/bakalari.png
+    mode: 0644

roles/ssh/defaults/main.yaml

@@ -0,0 +1,3 @@
+ssh_user: root
+ssh_dir: /root/.ssh
+ssh_keys: []

roles/ssh/tasks/main.yaml

@@ -0,0 +1,14 @@
+- name: Ensure SSH directory exists
+  file:
+    path: "{{ ssh_dir }}"
+    state: directory
+    owner: "{{ ssh_user }}"
+    group: "{{ ssh_user }}"
+    mode: 0700
+
+- name: Import SSH keys
+  authorized_key:
+    user: "{{ ssh_user }}"
+    key: "{{ item }}"
+    state: present
+  loop: "{{ ssh_keys }}"

setup.yaml

@@ -2,19 +2,12 @@
 - name: SSH
   hosts: all
   tags: ssh
-
-  tasks:
-    - name: Ensure root ssh directory exists
-      file:
-        path: /root/.ssh
-        state: directory
-
-    - name: Import SSH keys
-      authorized_key:
-        user: root
-        key: '{{ item }}'
-        state: present
-      loop: '{{ ssh_keys }}'
+  roles:
+    - role: ssh
+      vars:
+        ssh_keys:
+          - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEm981GRiUIsp8e4bTDv+d9SyHfQ8P18W5oovgmAfnip em@x210
+          - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDqmyaaIqRU9hx8PxRnIqe/pRANIxrEEscuMWrHZF1yh snowflake@flakeX230
 
 
 - name: General
@@ -276,15 +269,5 @@
 
 - name: Bakaláři
   hosts: teachers
-  tags: bakalari
-
-  tasks:
-    - name: Create a desktop shortcut for Bakaláři
-      copy:
-        src: "{{ item.src }}"
-        dest: "{{ item.dest }}"
-      loop:
-        - src: "files/bakalari/bakalari.desktop"
-          dest: "/usr/share/applications/bakalari.desktop"
-        - src: "files/bakalari/bakalari.png"
-          dest: "/usr/share/icons/bakalari.png"
+  roles:
+    - bakalari