Server generation
diff --git a/backupninja/map.jinja b/backupninja/map.jinja
index 0fe79ba..b9f24f3 100644
--- a/backupninja/map.jinja
+++ b/backupninja/map.jinja
@@ -22,34 +22,34 @@
{%- endif %}
{% set client = salt['grains.filter_by']({
- 'Debian': {
- 'pkgs': ['backupninja', 'debconf-utils'],
- 'service': 'backupninja',
- 'report_email': 'root',
- 'config': '/etc/default/backupninja',
- 'supported_services': services,
- 'monkey_patched': monkey_patched,
- 'config_monkeypatch': '{{ config_monkeypatch }}'
- },
- 'RedHat': {
- 'pkgs': ['backupninja'],
- 'service': 'backupninja',
- 'report_email': 'root',
- 'config': '/etc/sysconfig/backupninja',
- 'monkey_patched': monkey_patched,
- 'supported_services': services
- },
+ 'Debian': {
+ 'pkgs': ['backupninja', 'debconf-utils'],
+ 'service': 'backupninja',
+ 'report_email': 'root',
+ 'config': '/etc/default/backupninja',
+ 'supported_services': services,
+ 'monkey_patched': monkey_patched,
+ 'config_monkeypatch': '{{ config_monkeypatch }}'
+ },
+ 'RedHat': {
+ 'pkgs': ['backupninja'],
+ 'service': 'backupninja',
+ 'report_email': 'root',
+ 'config': '/etc/sysconfig/backupninja',
+ 'monkey_patched': monkey_patched,
+ 'supported_services': services
+ },
}, merge=salt['pillar.get']('backupninja:client')) %}
{% set server = salt['grains.filter_by']({
- 'Debian': {
- 'pkgs': ['rsync'],
- 'home_dir': '/srv/backupninja',
- 'keys': [],
- },
- 'RedHat': {
- 'pkgs': ['rsync'],
- 'home_dir': '/srv/backupninja',
- 'keys': [],
- },
-}, merge=salt['pillar.get']('backupninja:server')) %}
\ No newline at end of file
+ 'Debian': {
+ 'pkgs': ['rsync'],
+ 'home_dir': '/srv/backupninja',
+ 'keys': [],
+ },
+ 'RedHat': {
+ 'pkgs': ['rsync'],
+ 'home_dir': '/srv/backupninja',
+ 'keys': [],
+ },
+}, merge=salt['pillar.get']('backupninja:server')) %}
diff --git a/backupninja/server.sls b/backupninja/server.sls
index ee48694..ed37afe 100644
--- a/backupninja/server.sls
+++ b/backupninja/server.sls
@@ -32,4 +32,33 @@
{%- endfor %}
+{%- 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 %}
+
+/srv/backupninja/{{ node_name }}{{ fs_include }}:
+ file.directory:
+ - mode: 700
+ - user: backupninja
+ - group: backupninja
+ - makedirs: true
+ - require:
+ - file: /srv/backupninja/{{ node_name }}
+
+{%- endfor %}
+{%- endfor %}
+
+{%- endfor %}
+
{%- endif %}
\ No newline at end of file
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 5d7ab75..3720f9e 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -3,5 +3,4 @@
parameters:
backupninja:
server:
- enabled: true
- rdiff: true
\ No newline at end of file
+ enabled: true
\ No newline at end of file