Page MenuHomeDevCentral
Files F3777680

D1080.id2763.diff
No OneTemporary
Actions

D1080.id2763.diff
View Options

diff --git a/roles/saltmaster/account/init.sls b/roles/saltmaster/account/init.sls
--- a/roles/saltmaster/account/init.sls
+++ b/roles/saltmaster/account/init.sls
@@ -42,8 +42,9 @@
- fullname: Deployment and management of the Salt staging area
- uid: 9002
- gid: 9002
- - home: /opt/salt/staging
+ - home: /var/run/deploy
+# Allow to repair ownership if the account is created after the staging
deploy_account_ownership:
cmd.run:
- name: chown -R salt /opt/salt/staging /opt/salt/private/staging
diff --git a/roles/saltmaster/init.sls b/roles/saltmaster/init.sls
--- a/roles/saltmaster/init.sls
+++ b/roles/saltmaster/init.sls
@@ -9,4 +9,5 @@
include:
- .account
- .cloud
+ - .staging
- .salt-wrapper
diff --git a/roles/saltmaster/staging.sls b/roles/saltmaster/staging.sls
new file mode 100644
--- /dev/null
+++ b/roles/saltmaster/staging.sls
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------
+# Salt — Provision a salt master
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2017-10-21
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+# -------------------------------------------------------------
+# Git repositories for the staging area
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+staging_public_repository:
+ file.directory:
+ - name: /opt/salt/staging
+ - user: deploy
+ - group: deploy
+ - dir_mode: 775
+ git.latest:
+ - name: https://devcentral.nasqueron.org/source/staging.git
+ - target: /opt/salt/staging
+ - user: deploy
+ - update_head: False
+ - submodules: True
+
+staging_private_repository:
+ file.directory:
+ - name: /opt/salt/private/staging
+ - user: deploy
+ - group: deploy
+ - dir_mode: 770
+ git.latest:
+ - name: ssh://vcs@devcentral.nasqueron.org:5022/source/private-staging.git
+ - target: /opt/salt/private/staging
+ - user: deploy
+ - identity: /var/run/deploy/.ssh/id_ed25519
+ - update_head: False
+ - submodules: True

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 26, 02:11 (20 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2263465
Default Alt Text
D1080.id2763.diff (2 KB)

Event Timeline

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