Page MenuHomeDevCentral
Files F3715475

D1198.diff
No OneTemporary
Actions

D1198.diff
View Options

diff --git a/roles/shellserver/userland-software/files/builder.sudoers b/roles/builder/account/files/builder.sudoers
rename from roles/shellserver/userland-software/files/builder.sudoers
rename to roles/builder/account/files/builder.sudoers
--- a/roles/shellserver/userland-software/files/builder.sudoers
+++ b/roles/builder/account/files/builder.sudoers
@@ -1,10 +1,10 @@
# -------------------------------------------------------------
# Odderon
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Eglide
+# Project: Nasqueron
# Created: 2017-02-23
# License: Trivial work, not eligible to copyright
-# Source file: roles/shellserver/userland-software/files/builder.sudoers
+# Source file: roles/builder/account/files/builder.sudoers
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/shellserver/userland-software/account.sls b/roles/builder/account/init.sls
rename from roles/shellserver/userland-software/account.sls
rename to roles/builder/account/init.sls
--- a/roles/shellserver/userland-software/account.sls
+++ b/roles/builder/account/init.sls
@@ -30,5 +30,5 @@
builder_sudo_capabilities_file:
file.managed:
- name: {{ dirs.etc }}/sudoers.d/builder
- - source: salt://roles/shellserver/userland-software/files/builder.sudoers
+ - source: salt://roles/builder/account/files/builder.sudoers
- template: jinja
diff --git a/roles/shellserver/userland-software/init.sls b/roles/builder/init.sls
copy from roles/shellserver/userland-software/init.sls
copy to roles/builder/init.sls
--- a/roles/shellserver/userland-software/init.sls
+++ b/roles/builder/init.sls
@@ -1,13 +1,10 @@
# -------------------------------------------------------------
-# Salt — Provision software
+# Salt — Builder role
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Eglide
-# Created: 2016-04-10
+# Project: Nasqueron
+# Created: 2017-11-13
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
include:
- .account
- - .base
- - .irc
- - .web
diff --git a/roles/devserver/userland-software/init.sls b/roles/devserver/userland-software/init.sls
--- a/roles/devserver/userland-software/init.sls
+++ b/roles/devserver/userland-software/init.sls
@@ -11,6 +11,8 @@
- roles/shellserver/userland-software/base
- roles/shellserver/userland-software/irc
- roles/shellserver/userland-software/web
+ # Builder role content
+ - roles/builder
# Software specific for development servers
- .dev
- .misc
diff --git a/roles/shellserver/userland-software/init.sls b/roles/shellserver/userland-software/init.sls
--- a/roles/shellserver/userland-software/init.sls
+++ b/roles/shellserver/userland-software/init.sls
@@ -7,7 +7,7 @@
# -------------------------------------------------------------
include:
- - .account
+ - roles/builder/account
- .base
- .irc
- .web

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 6, 06:54 (21 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2231314
Default Alt Text
D1198.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