Page MenuHomeDevCentral
Files F3909536

D1026.diff
No OneTemporary
Actions

D1026.diff
View Options

diff --git a/map.jinja b/map.jinja
--- a/map.jinja
+++ b/map.jinja
@@ -4,12 +4,14 @@
'bin': '/usr/bin',
'include': '/usr/include',
'lib': '/usr/lib',
+ 'man': '/usr/share/man',
},
'FreeBSD' : {
'etc': '/usr/local/etc',
'bin': '/usr/local/bin',
'include': '/usr/local/include',
'lib': '/usr/local/lib',
+ 'man': '/usr/local/man',
},
}, default='Debian') %}
diff --git a/roles/saltmaster/salt-wrapper/files/salt-wrapper.conf b/roles/saltmaster/salt-wrapper/files/salt-wrapper.conf
new file mode 100644
--- /dev/null
+++ b/roles/saltmaster/salt-wrapper/files/salt-wrapper.conf
@@ -0,0 +1,21 @@
+{
+ "comments": [
+ "This file is managed by our rOPS SaltStack repository.",
+
+ "Changes to this file may cause incorrect behavior",
+ "and will be lost if the state is redeployed.",
+
+ "Source file: roles/saltmaster/salt-wrapper/files/salt-wrapper.conf"
+ ],
+
+ "roots": [
+ {
+ "config": "/usr/local/etc/salt-woodscloud",
+ "states": "/opt/woodscloud-operations"
+ },
+ {
+ "config": "/usr/local/etc/salt",
+ "states": "/opt/nasqueron-operations"
+ }
+ ]
+}
diff --git a/roles/saltmaster/salt-wrapper/init.sls b/roles/saltmaster/salt-wrapper/init.sls
new file mode 100644
--- /dev/null
+++ b/roles/saltmaster/salt-wrapper/init.sls
@@ -0,0 +1,47 @@
+# -------------------------------------------------------------
+# Salt — Salt master configuration
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2017-10-04
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+{% from "map.jinja" import dirs with context %}
+
+# -------------------------------------------------------------
+# Wrapper binaries
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ dirs.bin }}/salt-wrapper:
+ file.managed:
+ - source: salt://software/salt-wrapper/salt-wrapper.sh
+
+{{ dirs.bin }}/salt-get-config-dir:
+ file.managed:
+ - source: salt://software/salt-wrapper/salt-get-config-dir.py
+
+# -------------------------------------------------------------
+# Wrapper configuration
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ dirs.etc }}/salt-wrapper.conf:
+ file.managed:
+ - source: salt://roles/saltmaster/salt-wrapper/files/salt-wrapper.conf
+
+# -------------------------------------------------------------
+# Wrapper manual
+#
+# TODO: gzip those files
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ dirs.man }}/man1/salt-get-config-dir.1:
+ file.managed:
+ - source: salt://software/salt-wrapper/man/salt-get-config-dir.1
+
+{{ dirs.man }}/man1/salt-wrapper.1:
+ file.managed:
+ - source: salt://software/salt-wrapper/man/salt-wrapper.1
+
+{{ dirs.man }}/man5/salt-wrapper.conf.5:
+ file.managed:
+ - source: salt://software/salt-wrapper/man/salt-wrapper.conf.5
diff --git a/top.sls b/top.sls
--- a/top.sls
+++ b/top.sls
@@ -18,6 +18,7 @@
- roles/core/letsencrypt
'local':
- roles/saltmaster/sudo
+ - roles/saltmaster/salt-wrapper
'dwellers.nasqueron.org':
- roles/paas-docker/docker
- roles/paas-lxc/lxc

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 19, 20:25 (21 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2306804
Default Alt Text
D1026.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator