Merge remote-tracking branch 'github/pull/259'

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 27cc47d85c156de68cb4d875e3d9ee4819debd27..86cf5fb423b0308a0b9b5353fa460554e1526806 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -92,6 +92,7 @@ jobs:
           - web-frontend
           - web-rails
           - wordpress
+          - wiki
         os:
           - ubuntu-1804
       fail-fast: false

diff --git a/.kitchen.yml b/.kitchen.yml
index a9e3949c96a33584d1e67d5eeb1becbd49bce0e3..1f71e92cd36109cc78ea7783062518d3281920b3 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -323,3 +323,10 @@ suites:
   - name: wordpress
     run_list:
       - recipe[wordpress::default]
+  - name: wiki
+    run_list:
+      - recipe[apt::default]
+      - recipe[accounts::default]
+      - recipe[munin::default]
+      - recipe[wiki]
+      - role[wiki]

diff --git a/test/data_bags/accounts/wiki.json b/test/data_bags/accounts/wiki.json
new file mode 100644 (file)
index 0000000..0ee9618
--- /dev/null
+++ b/test/data_bags/accounts/wiki.json
@@ -0,0 +1,7 @@
+{
+  "id": "wiki",
+  "uid": "555",
+  "comment": "wiki.openstreetmap.org",
+  "home": "/opt/wiki",
+  "manage_home": false
+}

diff --git a/test/data_bags/wiki/passwords.json b/test/data_bags/wiki/passwords.json
new file mode 100644 (file)
index 0000000..de5589f
--- /dev/null
+++ b/test/data_bags/wiki/passwords.json
@@ -0,0 +1,6 @@
+{
+  "database": "pw1",
+  "admin": "pw2",
+  "recaptcha": "pw3",
+  "thunderforest": "pw4"
+}