commit bf73a55fa0cc27d970e9e4f2f18fcd069189a617
author Ales Komarek <mail@newt.cz> Tue Jan 30 13:28:18 2018 +0100
committer Martin Polreich <polreichmartin@gmail.com> Wed Jan 31 15:18:23 2018 +0100
tree 3d055c6722fa802780697acbf0f12d5133a121b8
parent 72805c4a1a462e040b691f49590e05fa8b63564a

Do not create unnecessary server directories

Change-Id: Ife6a2c6f206cba600f94398aee2e099f492f5372

backupninja/server.sls

diff --git a/backupninja/server.sls b/backupninja/server.sls
index 6a7783a..4be4fc4 100644
--- a/backupninja/server.sls
+++ b/backupninja/server.sls
@@ -38,16 +38,6 @@
 
 {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
 
-/srv/backupninja/{{ node_name }}:
-  file.directory:
-  - mode: 700
-  - user: backupninja
-  - group: backupninja
-  - makedirs: true
-  - require:
-    - user: backupninja_user
-    - pkg: backupninja_server_packages
-
 {%- for backup_name, backup in node_grains.get('backupninja', {}).get('backup', {}).iteritems() %}
 {%- for fs_include in backup.fs_includes %}
 
@@ -58,7 +48,8 @@
   - group: backupninja
   - makedirs: true
   - require:
-    - file: /srv/backupninja/{{ node_name }}
+    - user: backupninja_user
+    - pkg: backupninja_server_packages
 
 {%- endfor %}
 {%- endfor %}

tests/pillar/server_rdiff.sls

diff --git a/tests/pillar/server_rdiff.sls b/tests/pillar/server_rdiff.sls
index 977b942..7bd8a75 100644
--- a/tests/pillar/server_rdiff.sls
+++ b/tests/pillar/server_rdiff.sls
@@ -5,4 +5,4 @@
     key:
       client1.domain.com:
         enabled: true
-        key: ssh-key
+        key: MIICWwIBAAKBgHDOcqtOQ12iGujC5GFg1lrFauY2w578XdjynKcgRkYSQa8X4SYp3tRtkwYmQ3m0iSlO+eLhLVqIg3lSGuSlMYEpUM6iiuVfWQ6l2hqGymspabEalO1PgAEn8vrtOQ9cFDa6KD9J4UDulgRDJbWu02KD6EDR93lQo2vh/JnH7o2fAgMBAAECgYBVIxrcO0cQheX1QhIHhISDIXgao75kYWea8xBT+kHPZLv6H/WnTfaFMOXDwGEwm5bhfF+QYg5Ow7UmfVcatap0JY1WYYEyyi/o98l9M4SqF01yki/VB6dzsQEZyv/YT4PoeFbSONDIHMN5UwtDRYuYORaK1eGBjCDqtgh2WpDd0QJBALiP7RlY6zscOP3IicYZvIAUCag4tJe9mfcJULc8Pm0vAMF3XSuEQm95ABqTVtXQFPnR3O1gHxTfUcTxWojrzo0CQQCceFFzYG6+IMQaJhjzcZUQCxqmLVrEIxvsfxKVVgR/KVKvVZoV0XPk1qhO2R7clGOYO9zTb+1RcH1TlvKBiwfbAkEAkvA7k2+gsEny8dJEJkz9L3dEjQLAfQK93tkywv+ar/C5CE6RBgFhp0BNndrqSoZE/PRhkTdy53o4rrR9IP+kTQJAMKjmQ6hAqFYORkeEyOiQv82EOxutt4NnorOd9t0qRtV2BlrrsU9S6F6tNuAkzdpD4srzELolJoeCIiW2Qv0WswJAWiykhuRlPBW75UdnYIGrtTaDD0VmbD6zAeHyaoEBZJX48SR7v8szQzUph7pW3z770riY4xUVgbcBDH61w2q1Tg== email@domain.com