Page MenuHomeDevCentral
Files F35072743

No OneTemporary
Actions

View Options

diff --git a/roles/viperserv/account/init.sls b/roles/viperserv/account/init.sls
index 34cc9c8..f0a0c6b 100644
--- a/roles/viperserv/account/init.sls
+++ b/roles/viperserv/account/init.sls
@@ -1,47 +1,47 @@
# -------------------------------------------------------------
# Salt — Deploy ViperServ (eggdrop)
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-11-14
# Description: Eggdrop on Freenode
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% from "map.jinja" import dirs with context %}
# -------------------------------------------------------------
# Service accounts
# -------------------------------------------------------------
{% for username, user in pillar['viperserv_accounts'].items() %}
viperserv_account_{{ username }}:
user.present:
- name: {{ username }}
- fullname: {{ user['fullname'] }}
- uid: {{ user['uid'] }}
- gid: nasqueron-irc
- - home: /var/run/{{ username }}
+ - home: {{ dirs.share }}/{{ username }}
/var/run/{{ username }}:
file.directory:
- user: {{ user['uid'] }}
- group: nasqueron-irc
- dir_mode: 711
{% endfor %}
# -------------------------------------------------------------
# Sudo capabilities
#
# Members of nasqueron-irc should be able to sudo -u viperserv …
# -------------------------------------------------------------
viperserv_sudo_capabilities_file:
file.managed:
- name: {{ dirs.etc }}/sudoers.d/viperserv
- source: salt://roles/viperserv/account/files/viperserv.sudoers
- template: jinja
- context:
accounts: {{ pillar['viperserv_accounts'] }}
bots: {{ pillar['viperserv_bots'] }}
diff --git a/roles/viperserv/wikidata-access-layer/code.sls b/roles/viperserv/wikidata-access-layer/code.sls
index 9dd9fc3..0eb3619 100644
--- a/roles/viperserv/wikidata-access-layer/code.sls
+++ b/roles/viperserv/wikidata-access-layer/code.sls
@@ -1,29 +1,31 @@
# -------------------------------------------------------------
# Salt — Deploy eggdrop park
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2017-11-06
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
+{% from "map.jinja" import dirs with context %}
+
daeghrefn_wikidata_access_layer:
file.directory:
- name: /srv/wikidata-access-layer
- user: deploy
git.latest:
- name: https://devcentral.nasqueron.org/source/Daeghrefn-Wikidata.git
- target: /srv/wikidata-access-layer
- user: deploy
-/var/run/viperserv/bin:
+{{ dirs.share }}/viperserv/bin:
file.directory:
- user: viperserv
- group: nasqueron-irc
{% for script in ['create_given_name', 'create_surname'] %}
-/var/run/viperserv/bin/{{ script }}:
+{{ dirs.share }}/viperserv/bin/{{ script }}:
file.symlink:
- target: /srv/wikidata-access-layer/{{ script }}
- user: viperserv
- group: nasqueron-irc
{% endfor %}

File Metadata

Mime Type
text/x-diff
Expires
Wed, Jul 8, 15:00 (54 m, 58 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3903467
Default Alt Text
(3 KB)

Event Timeline

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