Merge pull request #39 from realraum/openwrt/roles-rename

Rename openwrt-image role to openwrt/image

diff --git a/ansible/.gitignore b/ansible/.gitignore
index e573ad5..d34e4c4 100644 (file)
--- a/ansible/.gitignore
+++ b/ansible/.gitignore
@@ -4,4 +4,4 @@
 *.retry
 .*.sw?
 /.cache/
-/files/*/openwrt/
+/artifacts

diff --git a/ansible/files/common/htoprc b/ansible/files/common/htoprc
new file mode 100644 (file)
index 0000000..97c196a
--- /dev/null
+++ b/ansible/files/common/htoprc
@@ -0,0 +1,26 @@
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+fields=0 48 17 18 38 39 40 2 46 47 49 1
+sort_key=46
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=0
+shadow_other_users=0
+show_thread_names=0
+show_program_path=1
+highlight_base_name=1
+highlight_megabytes=1
+highlight_threads=1
+tree_view=1
+header_margin=1
+detailed_cpu_time=0
+cpu_count_from_zero=0
+update_process_names=0
+account_guest_in_cpu_meter=0
+color_scheme=0
+delay=15
+left_meters=AllCPUs Memory Swap
+left_meter_modes=1 1 1
+right_meters=Tasks LoadAverage Uptime
+right_meter_modes=2 2 2

diff --git a/ansible/files/torwaechter/update-keys-from-stdin.sh b/ansible/files/torwaechter/update-keys-from-stdin.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/ansible/gpg/vault-keyring.gpg b/ansible/gpg/vault-keyring.gpg
index dec050d..30cf12f 100644 (file)
Binary files a/ansible/gpg/vault-keyring.gpg and b/ansible/gpg/vault-keyring.gpg differ

diff --git a/ansible/gpg/vault-pass.gpg b/ansible/gpg/vault-pass.gpg
index 8b65d63..c5ea5b9 100644 (file)
--- a/ansible/gpg/vault-pass.gpg
+++ b/ansible/gpg/vault-pass.gpg
@@ -1,64 +1,52 @@
 -----BEGIN PGP MESSAGE-----
-Version: GnuPG v2
 
-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
-=zW16
+hQIMA69crraWgqfLAQ/+NPg++MXt8OiatzrIhEI77LOmZic2cZe+M5kA5gPgsXcS
+6/3G3c/b6J+Kz6oOxx9SQxG8NP7eK3hPppNqUEi3Sq9PHxGoUYcGz8TNtUE2huAv
+q9vdlPBByIpqktIe3Du3sHkhb6MO95V11pTTuFHj1Qd35LuKcu/huxDk69E/l1pH
+dijznyDFcIZhNzy0QVd3/63ADG9TMLwMj7a8+i7N99r98p9IIOZ+3/S+g2YerD04
+EGdHhBPdEBn1H94r5wnQRmzTJbjSvVdiCH/trlh97IMlyp14Ti7y6cwETiAQ/Xsw
+h+m0rmFu5lFKtzRhlRz3jlF4QJdBa3oG0Pq68WS2cdY1cj3Q5ksPq0AzntOvF6tX
+nvMZL6BZTVxkDjpL1E8yJE2/9lBGsWxjiQciHFnwGP93Xk/phH97HGUDrCas4TcL
+mkHOrWGx+SXtOf1hQv3IjfdChW132sOPU6lF7nGIxPmuDc80lZyQmyk8K0m4UWVb
+vdwGhzrKA9jJFnoKd7d/jNBcm36hMxzLxcJRFehWsksAQ9nXDgQ9jwa3ppFhsx80
+5Fqc8u0De7gGqxgqcuesV8Z6c7yG4kLP6lh8Jr7F54LtBJyx7N2FQYG/EX1a7795
+orE8wlHj7I163HymhDaNqMtvr+Cxa3ZOPXbF+TOp+9jrVxJ1KQshu3wgyg/pUTOF
+AgwDsut2TczGUykBEACP32lXkQHwtefYihP1xvpYtPG1qvSGf67kqGU1KQyLELH0
+a3derKpjPlFqEb7oDqJKmcwWGX5ry5CtrGYmvZVNxEQIzTwaS/r9nzb+mCzjzKDk
+tMUlFmNbl4/u65aAVVXhFwrI0iccbouFKFhK4Tcb5nf2xvcy1DqGg27+SC4GMuTy
+GbbWTzSa09j1yDE8L4H/SQ2ZH7AdYOnYXyIV9o0qPGdlXLIfU+iOQ6fvDzb96/k6
+0up5cVPFU8mMDoscxQ8EZw2C6rz8JQAL/3dBgU2C01Z5wFWzr1YcMCaa67hOQWoE
+p0n1Uq4aJMVQ8h8X2VgEc9XOM0wtxfStQJFwJAJ2sBU9jasTTcUdfcPNK1hLQlFf
+trzglR3j/t2r7EZ6eKfIEYCKyXc6lnuIc4PcgXqlWmBCbzOX3dPp0TFSuHtYqWNu
+a+1YUY3cVd+VHoqbiaNHKIfa5EyUgjiyVAv0Z2ICn2nrQr9sFoTmQgnY+hAxMGqt
+mawjCu8+IaDvEXt+tQPk5SReyP/Wr8OUmWHuLIa9ZOrBmXLw2EX0VQUWkkjCntUY
+mFoIYNaTCRAvwSl2EONzSSopIRuiQTiZFaSCwBYW/FmfiOZM2NjWL0ohn4rZs4KI
+u9b21V5Yf2f2hM/RPD2J2GWeX4pW4q+xCkP6RsNxKrowE6SPh00a0YtzVwvleYUC
+DANyrXYtAg+lOQEP/iq9Vy0eXMpJXS5M6yKxCHZW6fusVTXfgeQr2VKo7MXFhz6M
+5M34Vqrxu4qcgbpj4mlHWFASzHVOY8Y5slM7oZQHn896qvD8q8g4ybmV1whFNBeR
+bqWnLPkD8REoDulpai+x7uf1zuVpWPi1a/WEYnTZyT3VmnBoU3h6Q492zKKplv/D
+aQUxvseHEQWRs/7w4iFbukR9BxWk0NFf7WwYlJTQQBiJlKqMJKgLFWI1R/qZIJ33
+v90kZC0uQJ5OerxLSv6XpK/bXJMoSLBhK4nybPLlckgmtlqQXUP5ZOJwpRx61w5b
++jcEnPdr4F2zxyRPo9+IbOiW/l0zYULTk790yFjJjoneDNzGc+QwRLtKdqm25H6X
+PKFrGEtr5anLz4JFoJGz912TOXF8ndEoaSMpCSgiQhpyJ5q5mIU0zaebfnmb71+4
+ocTGY0EfAikwY489TL9nkVbLzhd6XGJt4bXp3cqv6T+cdXCejP6RZ+pJIRXShxz0
+Pt9zmidYsG3MoOeQMJ7KZGLsRenhw9StLEp+j4Hv2FQ0me+iZaljUD8tZrEWgjeo
+quVnJ8HnbfPGrfv0PzFAKr686ERHvRT1Idp8UiK+UMHO1AVCQJ/ZzH3jDK7BQrNB
+z7u7dcWXcd4w7tcunkfBhumWmHLBGPze2snFje1QMhFYXoQprSD2qA76x/R/hQIM
+A3jn/WhOdR0JAQ/9HmlQUnXqDneXkVqnpoNtD5+t+esIOWKNNclfMUuVXmULqcNO
+k1mSMlvgxZwhlYuHUZZ+eX0WswRyagwExjdk9HY9l3nrwjxGDGLyN+hr4Yl+f3AZ
+cTZRHSQYZYZQb1yB7YJrW81d1c7i/LOw7JQVbYBx1JIBjS9WvZ9IXkfOSkWCjdpj
+/Xjbj5fYZnd08FsAaw7LAulaJXVZBGgyI+VXfMzBHdXMaFaFYuOLJBMoK58KDn3K
+DOxNRKGBaPXwThBalZyQd8KhwkwiiZW6TPdGXXYhs10KtLD+ohqZ7ZTT7T4W7hTI
+uUeMbCLpD2lq7WDDHMVZjoyxjXu8cdLYqMmAL/W9oMf1PO90xLXLFoW3qJD3lOlY
+vbQ3CwO1C+wp3jUiwZY0wbbyimiQnkCnjm42lOSGU1biaRVGpeKbW4e3eQBYFdcf
+bDH7NsVzIv6wyoHwguST2JviabvlVTlvUHgVFarr3jJBuEohmqtQhWLNn5Sy3SxX
+Y/N+lMoX+CdUYu9TJfetPGrHy+/55dM+A8xHEBlGSBqnHPaLro4VDd602ESGB8qT
++fe8HOqn2TPGuLFimaasndZKTvRqi3tyXpQGquM18Cxr6Ej0PsqRFCue5g2hz5at
+y1G5zA4gJP+9mwy1j56LRd2PROiLZeUZJCYb18Qf6aOPr/Ue0MoiN6AYR9LSvAG9
+mGEKBVrmg7loL0woR3CUum35LMiUc0TQNqurH1tZjaDnxruFlWV7LwHXJWje2vfm
+E7cBlue+tWttudi8rBGkKuCFfKaZHmmPmAEIJQAHFO+p/J1GVfoaTi89v14m7Cgt
+z0i9Jy1Gk7Vsq8WA6KrkBjdD+nD7xxJluJFm0Xkyt5ro8BWZ2qKIPUIx32HPKn+b
+O3RKgIQCVi0HXGRd4GTSVgDeitQQlWhnzEhNVUIFTJ+4u/G41y8OYIQL
+=9GzF
 -----END PGP MESSAGE-----

diff --git a/ansible/group_vars/accesspoints/main.yml b/ansible/group_vars/accesspoints/main.yml
index 1df3d41..7d4b030 100644 (file)
--- a/ansible/group_vars/accesspoints/main.yml
+++ b/ansible/group_vars/accesspoints/main.yml
@@ -146,34 +146,8 @@ openwrt_mixin:
       {{ key }}
       {% endfor %}
 
-  /root/.config/htop/htoprc:
-    content: |
-      # Beware! This file is rewritten by htop when settings are changed in the interface.
-      # The parser is also very primitive, and not human-friendly.
-      fields=0 48 17 18 38 39 40 2 46 47 49 1
-      sort_key=46
-      sort_direction=1
-      hide_threads=0
-      hide_kernel_threads=1
-      hide_userland_threads=0
-      shadow_other_users=0
-      show_thread_names=0
-      show_program_path=1
-      highlight_base_name=1
-      highlight_megabytes=1
-      highlight_threads=1
-      tree_view=1
-      header_margin=1
-      detailed_cpu_time=0
-      cpu_count_from_zero=0
-      update_process_names=0
-      account_guest_in_cpu_meter=0
-      color_scheme=0
-      delay=15
-      left_meters=AllCPUs Memory Swap
-      left_meter_modes=1 1 1
-      right_meters=Tasks LoadAverage Uptime
-      right_meter_modes=2 2 2
+  /etc/htoprc:
+    file: "{{ global_files_dir }}/common/htoprc"
 
 
 openwrt_uci:

diff --git a/ansible/group_vars/all/main.yml b/ansible/group_vars/all/main.yml
index cd8f05d..d617779 100644 (file)
--- a/ansible/group_vars/all/main.yml
+++ b/ansible/group_vars/all/main.yml
@@ -1,7 +1,10 @@
 ---
 # Build-related directories
+global_artifacts_dir: "{{ inventory_dir }}/artifacts"
 global_cache_dir: "{{ inventory_dir }}/.cache"
-global_artifacts_dir: "{{ inventory_dir }}/files"
+
+# Directory for static assets
+global_files_dir: "{{ inventory_dir }}/files"
 
 # Default credentials
 ## Root password; by default, undefined

diff --git a/ansible/host_vars/torwaechter/main.yml b/ansible/host_vars/torwaechter/main.yml
index 2a2316f..016ec44 100644 (file)
--- a/ansible/host_vars/torwaechter/main.yml
+++ b/ansible/host_vars/torwaechter/main.yml
@@ -31,11 +31,11 @@ openwrt_mixin:
 
   /usr/local/bin/authorized_keys.sh:
     mode: '0755'
-    file: "{{ global_artifacts_dir }}/{{ inventory_hostname }}/authorized_keys.sh"
+    file: "{{ global_files_dir }}/{{ inventory_hostname }}/authorized_keys.sh"
 
   /usr/local/bin/update-keys-from-stdin.sh:
     mode: '0755'
-    file: "{{ global_artifacts_dir }}/{{ inventory_hostname }}/update-keys-from-stdin.sh"
+    file: "{{ global_files_dir }}/{{ inventory_hostname }}/update-keys-from-stdin.sh"
 
   /etc/ssh/sshd_config:
     content: |

diff --git a/ansible/roles/base/tasks/main.yml b/ansible/roles/base/tasks/main.yml
index c155be4..7fb9d24 100644 (file)
--- a/ansible/roles/base/tasks/main.yml
+++ b/ansible/roles/base/tasks/main.yml
@@ -148,19 +148,6 @@
 
   when: ansible_distribution == "Ubuntu"
 
-- name: install zshrc
-  with_items:
-    - src: "zprofile"
-      dest: "/etc/zsh/zprofile"
-    - src: "zshrc"
-      dest: "/etc/zsh/zshrc"
-    - src: "zshrc.skel"
-      dest: "/etc/skel/.zshrc"
-  copy:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    mode: 0644
-
 - name: set root default shell to zsh
   user:
     name: root
@@ -173,3 +160,18 @@
     dest: /etc/adduser.conf
     regexp: "^#?{{ item.key }}="
     line: "{{ item.key }}={{ item.value }}"
+
+- name: Deploy default configuration for tools
+  with_dict:
+    /etc/htoprc: "{{ global_files_dir }}/common/htoprc"
+
+    /etc/zsh/zprofile: zprofile
+    /etc/zsh/zshrc: zshrc
+    /etc/skel/.zshrc: zshrc.skel
+
+  loop_control:
+    label: "{{ item.key }}"
+  copy:
+    mode: 0644
+    src: "{{ item.value }}"
+    dest: "{{ item.key }}"