2017-02-19g~2020-06-23, fix link targets, lock down Sandstorm settings

This commit is contained in:
John Bintz 2020-06-23 17:38:48 -04:00
parent d44bb4f96b
commit 5d20a56542
6 changed files with 26 additions and 12 deletions

View File

@ -1 +1 @@
2017-02-19g~2020-06-20 2017-02-19g~2020-06-23

View File

@ -27,6 +27,8 @@ if [ ! -e /var/lib/dokuwiki/conf/local.php ]; then
cp /opt/app/local.php /var/lib/dokuwiki/conf cp /opt/app/local.php /var/lib/dokuwiki/conf
fi fi
rm -f /var/lib/dokuwiki/conf/conf rm -f /var/lib/dokuwiki/conf/conf
# sandstorm-specific things go here
cp /opt/app/local.protected.php /var/lib/dokuwiki/conf
if [ ! -e /var/lib/dokuwiki/data ]; then if [ ! -e /var/lib/dokuwiki/data ]; then
echo Adding data. echo Adding data.

View File

@ -3017,6 +3017,7 @@ opt/app/dokuwiki/vendor/splitbrain/php-archive/src/FileInfo.php
opt/app/dokuwiki/vendor/splitbrain/php-archive/src/Tar.php opt/app/dokuwiki/vendor/splitbrain/php-archive/src/Tar.php
opt/app/dokuwiki/vendor/splitbrain/php-archive/src/Zip.php opt/app/dokuwiki/vendor/splitbrain/php-archive/src/Zip.php
opt/app/local.php opt/app/local.php
opt/app/local.protected.php
opt/app/plugin opt/app/plugin
opt/app/plugin/README opt/app/plugin/README
opt/app/plugin/auth.php opt/app/plugin/auth.php

View File

@ -19,7 +19,7 @@ const pkgdef :Spk.PackageDefinition = (
appTitle = (defaultText = "DokuWiki"), appTitle = (defaultText = "DokuWiki"),
appVersion = 6, # Increment this for every release. appVersion = 7, # Increment this for every release.
appMarketingVersion = (defaultText = (embed "app-marketing-version")), appMarketingVersion = (defaultText = (embed "app-marketing-version")),
# Human-readable representation of appVersion. Should match the way you # Human-readable representation of appVersion. Should match the way you

View File

@ -9,13 +9,4 @@
*/ */
$conf['showuseras'] = 'username'; $conf['showuseras'] = 'username';
$conf['useacl'] = 1; //Use Access Control Lists to restrict access? $conf['target']['extern'] = '_blank'; // always open external links in a new window
$conf['autopasswd'] = 0; //autogenerate passwords and email them to user
$conf['authtype'] = 'sandstorm'; //which authentication backend should be used
$conf['superuser'] = '@admin'; //The admin can be user or @group or comma separated list user1,@group1,user2
$conf['manager'] = '@manager'; //The manager can be user or @group or comma separated list user1,@group1,user2
$conf['profileconfirm'] = 0; //Require current password to confirm changes to user profile
$conf['disableactions']='login';
$conf['userewrite'] = 1; //this makes nice URLs: 0: off 1: .htaccess 2: internal
$conf['useslash'] = 1; //use slash instead of colon? only when rewrite is on
$conf['savedir'] = '/var/lib/dokuwiki/data'; //where to store all the files

20
local.protected.php Normal file
View File

@ -0,0 +1,20 @@
<?php
/**
* This is an example of how a local.php could look like.
* Simply copy the options you want to change from dokuwiki.php
* to this file and change them.
*
* When using the installer, a correct local.php file be generated for
* you automatically.
*/
$conf['autopasswd'] = 0; //autogenerate passwords and email them to user
$conf['authtype'] = 'sandstorm'; //which authentication backend should be used
$conf['superuser'] = '@admin'; //The admin can be user or @group or comma separated list user1,@group1,user2
$conf['manager'] = '@manager'; //The manager can be user or @group or comma separated list user1,@group1,user2
$conf['profileconfirm'] = 0; //Require current password to confirm changes to user profile
$conf['disableactions']='login';
$conf['userewrite'] = 1; //this makes nice URLs: 0: off 1: .htaccess 2: internal
$conf['useslash'] = 1; //use slash instead of colon? only when rewrite is on
$conf['useacl'] = 1; //Use Access Control Lists to restrict access?
$conf['savedir'] = '/var/lib/dokuwiki/data'; //where to store all the files