Page MenuHomeDevCentral
Files F12239396

No OneTemporary
Actions

View Options

diff --git a/GIDs b/GIDs
index c2891c9..0101963 100644
--- a/GIDs
+++ b/GIDs
@@ -1,11 +1,10 @@
827 chaton-dev
828 deployment
829 nasqueron-irc
-990 quassel
3001 ops
#3002 is intentionally left unassigned
3003 deployment
3004 mediawiki
9001 salt
9002 deploy
9003 web
diff --git a/UIDs b/UIDs
index dfc76b6..f6f670f 100644
--- a/UIDs
+++ b/UIDs
@@ -1,10 +1,9 @@
830 odderon
831 builder
832 chaton
833 viper
834 tc2
-990 quassel
3004 mediawiki
9001 salt
9002 deploy
8900 zr
diff --git a/roles/shellserver/quassel-core/account.sls b/roles/shellserver/quassel-core/account.sls
deleted file mode 100644
index c661ddc..0000000
--- a/roles/shellserver/quassel-core/account.sls
+++ /dev/null
@@ -1,26 +0,0 @@
-# -------------------------------------------------------------
-# Salt — Provision Quassel core
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Eglide
-# Created: 2018-03-28
-# License: Trivial work, not eligible to copyright
-# -------------------------------------------------------------
-
-{% from "map.jinja" import shells with context %}
-
-# -------------------------------------------------------------
-# Account
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-quassel_account:
- group.present:
- - name: quassel
- - gid: 990
- - system: True
- user.present:
- - name: quassel
- - fullname: Quassel core
- - uid: 990
- - gid: 990
- - home: /var/lib/quassel
- - shell: {{ shells.nologin }}
diff --git a/roles/shellserver/quassel-core/certificate.sls b/roles/shellserver/quassel-core/certificate.sls
index c746e44..3560786 100644
--- a/roles/shellserver/quassel-core/certificate.sls
+++ b/roles/shellserver/quassel-core/certificate.sls
@@ -1,30 +1,31 @@
# -------------------------------------------------------------
# Salt — Provision Quassel core
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
# Created: 2018-03-28
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
+{% from "roles/shellserver/quassel-core/map.jinja" import quassel with context %}
+
# -------------------------------------------------------------
# Certificate
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/var/lib/quassel:
file.directory:
- - user: quassel
- - group: quassel
+ - user: {{ quassel.user }}
+ - group: {{ quassel.group }}
quassel_certificate:
cmd.run:
- name: cat privkey.pem cert.pem > /var/lib/quassel/quasselCert.pem
- cwd: /etc/letsencrypt/live/quassel.eglide.org
- - creates: /var/lib/quassel/quasselCert.pem
quassel_certificate_rights:
file.managed:
- name: /var/lib/quassel/quasselCert.pem
- replace: False
- - user: quassel
- - group: quassel
+ - user: {{ quassel.user }}
+ - group: {{ quassel.group }}
- mode: 400
diff --git a/roles/shellserver/quassel-core/init.sls b/roles/shellserver/quassel-core/init.sls
index df8e1bc..5f68bab 100644
--- a/roles/shellserver/quassel-core/init.sls
+++ b/roles/shellserver/quassel-core/init.sls
@@ -1,12 +1,11 @@
# -------------------------------------------------------------
# Salt — Provision Quassel core
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
# Created: 2018-03-28
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
include:
- - .account
- .certificate
- .software
diff --git a/roles/shellserver/quassel-core/init.sls b/roles/shellserver/quassel-core/map.jinja
similarity index 61%
copy from roles/shellserver/quassel-core/init.sls
copy to roles/shellserver/quassel-core/map.jinja
index df8e1bc..841de20 100644
--- a/roles/shellserver/quassel-core/init.sls
+++ b/roles/shellserver/quassel-core/map.jinja
@@ -1,12 +1,18 @@
# -------------------------------------------------------------
# Salt — Provision Quassel core
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
# Created: 2018-03-28
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-include:
- - .account
- - .certificate
- - .software
+{% set quassel = salt['grains.filter_by']({
+ 'Arch' : {
+ 'user': 'quassel',
+ 'group': 'quassel',
+ },
+ 'Debian': {
+ 'user': 'quasselcore',
+ 'group': 'quassel',
+ },
+}, default='Arch') %}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Oct 11, 21:26 (1 d, 4 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3064098
Default Alt Text
(4 KB)

Event Timeline

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