From 77ea8ec004ef3f8081a669b70bb6267f88948478 Mon Sep 17 00:00:00 2001
From: Olav Reinert <seroton10@gmail.com>
Date: Apr 17 2021 18:28:33 +0000
Subject: new-forum: treat core/install as a tool


It is provided with vBulletin, but should be removed from all production
systems.

---

diff --git a/salt/profile/vbulletin/README.md b/salt/profile/vbulletin/README.md
index 1633e12..03c1da8 100644
--- a/salt/profile/vbulletin/README.md
+++ b/salt/profile/vbulletin/README.md
@@ -1,9 +1,20 @@
 # vBulletin 5 Setup for openSUSE Forums
 
-## Setup tools
+Brief setup instructions:
+
+ 1. Prepare the binaries as instructed in [init.sls](init.sls).
+ 1. ``salt-call state.apply grains``
+ 1. ``salt-call state.apply pillar='{"vbulletin":{"tools":"yes"}}'``
+ 1. ``cd /srv/www/vhosts/forums/``
+ 1. ``(cd htdocs/core/install; sudo -u nginx php -f upgrade.php)``
+ 1. `` mysql webforums <db-tweaks.sql``
+ 1. ``(cd htdocs/core/install; sudo -u nginx php -f upgrade.php)``
+ 1. ``salt-call state.apply``
+
+## vBulletin setup tools
 
 If the pillar ``vbulletin.tools`` is truthy, the extra files described below
-are available to aid with setup of the new forums.
+are available to aid with setup of vBulletin.
 
 **It is important to disable the ``vbulletin.tools`` pillar and running
 ``highstate`` again to remove the files before production use.**
@@ -38,5 +49,5 @@ Enable the _Default vB5 Style_, then customize these style variables:
  * ``global_palette_accent_02`` = #73ba25
  * ``global_palette_text_04`` = #5a911d
 
-Finally, change the site logo using the file ``logo_color_90.png``.
+Finally, change the [site logo](files/logo-color-90.png).
 
diff --git a/salt/profile/vbulletin/tools.sls b/salt/profile/vbulletin/tools.sls
index 8679016..e70df03 100644
--- a/salt/profile/vbulletin/tools.sls
+++ b/salt/profile/vbulletin/tools.sls
@@ -1,7 +1,19 @@
-# NB: do not enable these tools in production
+# NB: these tools should not be enabled in production
 
 {% set tools = salt['pillar.get']('vbulletin:tools', False) %}
 
+/srv/www/vhosts/forums/htdocs/core/install:
+{% if tools %}
+  file.copy:
+    - source: /srv/www/vhosts/forums/upload/core/install
+    - preserve: True
+    - user: root
+    - group: nginx
+    - mode: 644
+{% else %}
+  file.absent
+{% endif %}
+
 /srv/www/vhosts/forums/htdocs/vb_test.php:
 {% if tools %}
   file.managed: