get 2017-02-19g working
This commit is contained in:
John Bintz
parent
1847cb725c
commit
84e063e22d
|
|
@ -1,3 +1,3 @@
|
|||
[submodule "dokuwiki"]
|
||||
path = dokuwiki
|
||||
url = git://github.com/ndarilek/dokuwiki.git
|
||||
url = https://github.com/splitbrain/dokuwiki.git
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ if [ -f /opt/app/dokuwiki/composer.json ] ; then
|
|||
fi
|
||||
|
||||
rsync -a /opt/app/plugin/ /opt/app/dokuwiki/lib/plugins/sandstorm/
|
||||
cp /opt/app/500.html /opt/app/dokuwiki/
|
||||
cp /opt/app/preload.php /opt/app/dokuwiki/inc/
|
||||
|
||||
for p in /opt/app/dokuwiki/{conf,data,lib/plugins,lib/tpl}; do
|
||||
if [ ! -e $p.orig ]; then
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Create a bunch of folders under the clean /var that php and nginx expect to exist
|
||||
mkdir -p /var/lib/nginx
|
||||
mkdir -p /var/lib/php7.0/sessions
|
||||
mkdir -p /var/lib/php/sessions
|
||||
mkdir -p /var/log
|
||||
mkdir -p /var/log/nginx
|
||||
mkdir -p /var/www
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
|
|||
|
||||
appTitle = (defaultText = "DokuWiki"),
|
||||
|
||||
appVersion = 5, # Increment this for every release.
|
||||
appVersion = 7, # Increment this for every release.
|
||||
|
||||
appMarketingVersion = (defaultText = "2017-02-19b-sandstorm6"),
|
||||
appMarketingVersion = (defaultText = "2017-02-19g~2020-06-13"),
|
||||
# Human-readable representation of appVersion. Should match the way you
|
||||
# identify versions of your app in documentation and marketing.
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ http {
|
|||
default_type application/octet-stream;
|
||||
|
||||
# Logging
|
||||
access_log off;
|
||||
error_log stderr;
|
||||
|
||||
# Prevent nginx from adding compression; this interacts badly with Sandstorm
|
||||
|
|
@ -38,6 +37,8 @@ http {
|
|||
listen 8000 default_server;
|
||||
listen [::]:8000 default_server ipv6only=on;
|
||||
|
||||
access_log /var/log/nginx/access.log;
|
||||
|
||||
# Allow arbitrarily large bodies - Sandstorm can handle them, and requests
|
||||
# are authenticated already, so there's no reason for apps to add additional
|
||||
# limits by default.
|
||||
|
|
@ -47,6 +48,8 @@ http {
|
|||
root /opt/app/dokuwiki;
|
||||
index doku.php;
|
||||
|
||||
error_page 500 ../500.html;
|
||||
|
||||
location ~ /(data/|conf/|bin/|inc/|install.php) { deny all; }
|
||||
|
||||
location / {
|
||||
|
|
@ -66,6 +69,7 @@ http {
|
|||
fastcgi_pass unix:/var/run/php-fpm7.0.sock;
|
||||
fastcgi_param REDIRECT_STATUS 200;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_intercept_errors on;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
<html>
|
||||
<head><title>Uh oh, a plugin might be failing...</title></head>
|
||||
<body>
|
||||
<h1>Uh oh, a plugin might be failing...</h1>
|
||||
<p>
|
||||
You might have a plugin that's failing. If you installed any
|
||||
custom plugins manually, they may not function correctly with
|
||||
this version of DokuWiki. You should look in they
|
||||
Grain Log for this grain to examine the errors from PHP-FPM.
|
||||
If the issue is in plugin code, you'll have to remove the plugin manually
|
||||
from the grain's filestructure via backup and restore.
|
||||
You can then try installing a new version of the plugin, or find
|
||||
a different one with better compatibility.
|
||||
</p>
|
||||
|
||||
<h2>To fix a plugin issue:</h2>
|
||||
|
||||
<ol>
|
||||
<li>Download a Backup of the grain.</li>
|
||||
<li>Unzip the grain archive.</li>
|
||||
<li>
|
||||
Find the plugin that the error is referring to in
|
||||
the <code>data/lib/dokiwiki/lib/plugins</code> folder and remove the
|
||||
plugin's folder.
|
||||
</li>
|
||||
<li>
|
||||
Zip up the unzipped grain archive, taking care to
|
||||
preserve the same root files/folders as the original
|
||||
Zip file.
|
||||
</li>
|
||||
<li>
|
||||
Restore the grain from backup using the new Zip file.
|
||||
</li>
|
||||
<li>
|
||||
Run the new grain. If it's working again, great!
|
||||
If not, see if the error is still with plugins that
|
||||
need removal/upgrading.
|
||||
</li>
|
||||
</ol>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
# DokuWiki Sandstorm
|
||||
|
||||
## Building a new version
|
||||
|
||||
```
|
||||
bin/upgrade_dokuwiki <target git tag from https://github.com/splitbrain/dokuwiki>
|
||||
# follow the directions
|
||||
```
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
cd dokuwiki
|
||||
git reset --hard
|
||||
git clean -dxf
|
||||
find . -name '*.orig' -exec rm -Rf {} \;
|
||||
|
||||
echo "Dokuwiki cleaned up for another build attempt"
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
#!/bin/bash
|
||||
|
||||
bin/cleanup_dokuwiki
|
||||
cd dokuwiki
|
||||
git fetch
|
||||
git checkout $1
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Tag not found!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd ..
|
||||
|
||||
echo "Now:"
|
||||
echo
|
||||
echo "vagrant-spk vm destroy"
|
||||
echo "vagrant-spk vm up"
|
||||
echo "Test locally"
|
||||
echo "vagrant-spk pack ../dokuwiki-sandstorm-$1.pkg"
|
||||
echo "Test upgrade"
|
||||
echo "vagrant-spk publish ../dokuwiki-sandstorm-$1.pkg"
|
||||
|
||||
2
dokuwiki
2
dokuwiki
|
|
@ -1 +1 @@
|
|||
Subproject commit d3d13e525967aac5b41c37f6ed7b1a5dcb30fb78
|
||||
Subproject commit a5690a8c536c2fc9bdb8871714c9978ea2c19c98
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
<?php
|
||||
ini_set('display_errors', '1');
|
||||
ini_set('display_startup_errors', '1');
|
||||
error_reporting(E_ALL);
|
||||
Loading…
Reference in New Issue