diff --git a/.sandstorm/app-marketing-version b/.sandstorm/app-marketing-version index 393efcb..bdc5094 100644 --- a/.sandstorm/app-marketing-version +++ b/.sandstorm/app-marketing-version @@ -1 +1 @@ -2017-02-19g~2020-06-20 +2017-02-19g~2020-06-23 diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh index 7d7a249..6065016 100755 --- a/.sandstorm/launcher.sh +++ b/.sandstorm/launcher.sh @@ -27,6 +27,8 @@ if [ ! -e /var/lib/dokuwiki/conf/local.php ]; then cp /opt/app/local.php /var/lib/dokuwiki/conf fi 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 echo Adding data. diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index c38d2cb..11ef031 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -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/Zip.php opt/app/local.php +opt/app/local.protected.php opt/app/plugin opt/app/plugin/README opt/app/plugin/auth.php diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index ca6216a..19a804a 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -19,7 +19,7 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "DokuWiki"), - appVersion = 6, # Increment this for every release. + appVersion = 7, # Increment this for every release. appMarketingVersion = (defaultText = (embed "app-marketing-version")), # Human-readable representation of appVersion. Should match the way you diff --git a/local.php b/local.php index 9871e89..31a7bcf 100644 --- a/local.php +++ b/local.php @@ -9,13 +9,4 @@ */ $conf['showuseras'] = 'username'; -$conf['useacl'] = 1; //Use Access Control Lists to restrict access? -$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 +$conf['target']['extern'] = '_blank'; // always open external links in a new window diff --git a/local.protected.php b/local.protected.php new file mode 100644 index 0000000..fbc32a3 --- /dev/null +++ b/local.protected.php @@ -0,0 +1,20 @@ +