cope with ubuntu 14.04 rsync command in in the same but in a little less monkey way
diff --git a/backupninja/client.sls b/backupninja/client.sls
index e761c6f..7edf512 100644
--- a/backupninja/client.sls
+++ b/backupninja/client.sls
@@ -115,4 +115,4 @@
{%- endif %}
-{%- endif %}
+{%- endif %}
\ No newline at end of file
diff --git a/backupninja/files/rsync.conf b/backupninja/files/rsync.conf
index eb35288..f768f5b 100644
--- a/backupninja/files/rsync.conf
+++ b/backupninja/files/rsync.conf
@@ -193,7 +193,11 @@
#bandwidthlimit =
# remote rsync program (remote dest only)
+{%- if grains.os == 'Ubuntu' and grains.osrelease >= '14.04' %}
+remote_rsync = '{% for fs_include in backup.fs_includes %} mkdir -p /srv/backupninja/{{ network.fqdn }}{{ fs_include }} && {% endfor %} rsync'
+{%- else %}
#remote_rsync = rsync
+{%- endif %}
# set to "yes" to rsync write a batch file from the changes
#batch = no
diff --git a/backupninja/map.jinja b/backupninja/map.jinja
index b9f24f3..ebbc5c3 100644
--- a/backupninja/map.jinja
+++ b/backupninja/map.jinja
@@ -1,25 +1,3 @@
-{% set services = [
- 'csb.server',
- 'gitlab.server',
- 'leonardo.server',
- 'moodle.server',
- 'mysql.server',
- 'postgresql.server',
- 'redmine.server',
- 'taiga.server',
- 'webcms.server',
-] %}
-
-{% set monkey_patched = [
- 'leonardo.server',
- 'postgresql.server',
-] %}
-
-{%- if grains.osrelease >= '14.04' %}
-{% set config_monkeypatch = True %}
-{%- else %}
-{% set config_monkeypatch = False %}
-{%- endif %}
{% set client = salt['grains.filter_by']({
'Debian': {
@@ -27,17 +5,12 @@
'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')) %}