updated dokuwiki state

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
+    - 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

states/dokuwiki/defaults.yaml

@@ -13,3 +13,5 @@ dokuwiki:
     superuser: '@admin'
     disableactions: 'register'
     savedir: '/home/dokuwiki'
+  acls: {}
+  users: {}

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) -%}
+{%- set dokuwiki = salt['pillar.get']('dokuwiki', default=defaults, merge=True) -%}
+
+{%- set users = salt['pillar.get']('users', default={}) -%}

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 %}

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 %}