From 33afaf3577585552706272a9b5eab34092c7ab2e Mon Sep 17 00:00:00 2001
From: Paul Lecuq <paul@paulbsd.com>
Date: Thu, 30 Jul 2020 14:06:36 +0200
Subject: [PATCH] updated dokuwiki state

---
 states/dokuwiki/config.sls                  | 20 ++++++++++++++++++--
 states/dokuwiki/defaults.yaml               |  2 ++
 states/dokuwiki/map.jinja                   |  4 +++-
 states/dokuwiki/templates/acl.auth.php.j2   |  5 +++++
 states/dokuwiki/templates/users.auth.php.j2 |  5 +++++
 5 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 states/dokuwiki/templates/acl.auth.php.j2
 create mode 100644 states/dokuwiki/templates/users.auth.php.j2

diff --git a/states/dokuwiki/config.sls b/states/dokuwiki/config.sls
index b6c6e04..1c35e1f 100644
--- a/states/dokuwiki/config.sls
+++ b/states/dokuwiki/config.sls
@@ -1,9 +1,25 @@
 ---
 {%- from "dokuwiki/map.jinja" import dokuwiki with context %}
-dokuwiki-config:
+dokuwiki-config-local:
   file.managed:
     - name: {{ dokuwiki.install_dir }}/dokuwiki/conf/local.php
     - source: salt://dokuwiki/templates/local.php.j2
     - user: {{ dokuwiki.user }}
     - group: {{ dokuwiki.group }}
-    - template: jinja
\ No newline at end of file
+    - template: jinja
+
+dokuwiki-config-acl:
+  file.managed:
+    - name: {{ dokuwiki.install_dir }}/dokuwiki/conf/acl.auth.php
+    - source: salt://dokuwiki/templates/acl.auth.php.j2
+    - user: {{ dokuwiki.user }}
+    - group: {{ dokuwiki.group }}
+    - template: jinja
+
+dokuwiki-config-users:
+  file.managed:
+    - name: {{ dokuwiki.install_dir }}/dokuwiki/conf/users.auth.php
+    - source: salt://dokuwiki/templates/users.auth.php.j2
+    - user: {{ dokuwiki.user }}
+    - group: {{ dokuwiki.group }}
+    - template: jinja
diff --git a/states/dokuwiki/defaults.yaml b/states/dokuwiki/defaults.yaml
index f9fdd82..281e863 100644
--- a/states/dokuwiki/defaults.yaml
+++ b/states/dokuwiki/defaults.yaml
@@ -13,3 +13,5 @@ dokuwiki:
     superuser: '@admin'
     disableactions: 'register'
     savedir: '/home/dokuwiki'
+  acls: {}
+  users: {}
diff --git a/states/dokuwiki/map.jinja b/states/dokuwiki/map.jinja
index 0c30141..f45f1ae 100644
--- a/states/dokuwiki/map.jinja
+++ b/states/dokuwiki/map.jinja
@@ -2,4 +2,6 @@
 
 {%- set defaults = salt['grains.filter_by'](default_settings, default='dokuwiki') -%}
 
-{%- set dokuwiki = salt['pillar.get']('dokuwiki', default=defaults, merge=True) -%}
\ No newline at end of file
+{%- set dokuwiki = salt['pillar.get']('dokuwiki', default=defaults, merge=True) -%}
+
+{%- set users = salt['pillar.get']('users', default={}) -%}
diff --git a/states/dokuwiki/templates/acl.auth.php.j2 b/states/dokuwiki/templates/acl.auth.php.j2
new file mode 100644
index 0000000..39e2119
--- /dev/null
+++ b/states/dokuwiki/templates/acl.auth.php.j2
@@ -0,0 +1,5 @@
+<?php
+{%- from "dokuwiki/map.jinja" import dokuwiki with context %}
+{%- for key, value in dokuwiki.acls.items() %}
+{{ value.scope }} {{ value.apply }} {{ value.right }}
+{%- endfor %}
diff --git a/states/dokuwiki/templates/users.auth.php.j2 b/states/dokuwiki/templates/users.auth.php.j2
new file mode 100644
index 0000000..c34802d
--- /dev/null
+++ b/states/dokuwiki/templates/users.auth.php.j2
@@ -0,0 +1,5 @@
+{%- from "dokuwiki/map.jinja" import dokuwiki with context %}
+{%- from "dokuwiki/map.jinja" import users with context %}
+{%- for user in users %}
+{{ user.name }}:{{ salt['shadow.gen_password'](password=user.password) }}:{{ user.fullname }}:{{ user.email|default("unknown@example.com") }}:{{ ([user.gid] + user.optional_groups)|join(",") }}
+{%- endfor %}