From: nicoo <nicoo@realraum.at>
Date: Mon, 26 Nov 2018 21:45:10 +0000 (+0100)
Subject: ansible: Split files and artifact directories
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=ca8b4fa48837034ffb13a02de8f89d350da4896d;p=noc.git

ansible: Split files and artifact directories

- artifacts are assets generated by Ansible, not under version control
- files are static assets under version control
---

diff --git a/ansible/.gitignore b/ansible/.gitignore
index e573ad5..d34e4c4 100644
--- a/ansible/.gitignore
+++ b/ansible/.gitignore
@@ -4,4 +4,4 @@
 *.retry
 .*.sw?
 /.cache/
-/files/*/openwrt/
+/artifacts
diff --git a/ansible/group_vars/all/main.yml b/ansible/group_vars/all/main.yml
index cd8f05d..d617779 100644
--- 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
--- 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: |