Merge "Mend machines status"
diff --git a/maas/files/pgpass b/maas/files/pgpass
new file mode 100644
index 0000000..daca0c7
--- /dev/null
+++ b/maas/files/pgpass
@@ -0,0 +1,2 @@
+{%- from "maas/map.jinja" import region with context %}
+{{ region.database.host }}:5432:{{ region.database.name }}:{{ region.database.username }}:{{ region.database.password }}
\ No newline at end of file
diff --git a/maas/meta/backupninja.yml b/maas/meta/backupninja.yml
new file mode 100644
index 0000000..36a18af
--- /dev/null
+++ b/maas/meta/backupninja.yml
@@ -0,0 +1,8 @@
+backup:
+ maas:
+ fs_includes:
+ - /etc/maas
+ - /var/lib/maas
+ - /var/backups/postgresql
+ fs_excludes:
+ - /var/lib/maas/boot-resources
diff --git a/maas/region.sls b/maas/region.sls
index a83003f..3b88307 100644
--- a/maas/region.sls
+++ b/maas/region.sls
@@ -78,6 +78,14 @@
- require:
- pkg: maas_region_packages
+/root/.pgpass:
+ file.managed:
+ - source: salt://maas/files/pgpass
+ - template: jinja
+ - user: root
+ - group: root
+ - mode: 600
+
maas_region_services:
service.running:
- enable: true
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 09b1d97..5085e28 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -9,3 +9,5 @@
enabled: false
sphinx:
enabled: true
+ backupninja:
+ enabled: true