From 7af9d44cd30b421b88391a0c755b3631b49c1294 Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Thu, 23 Nov 2017 11:47:09 -0500
Subject: [PATCH] get latest snapshot

---
 Mediawiki_Setup_Guide | 22 ++++++++++++++++------
 mw-setup-script       | 17 +++++++++++++----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/Mediawiki_Setup_Guide b/Mediawiki_Setup_Guide
index 81f4d62..ff7ee77 100644
--- a/Mediawiki_Setup_Guide
+++ b/Mediawiki_Setup_Guide
@@ -22,10 +22,10 @@
 '''Version Support'''
 
 Very minor adjustments needed for other distros. Help expand this list.
-* Mediawiki 1.28, updated as new versions are released
+* Mediawiki 1.28, 1.27 support is planned to be re-added.
 * Debian 8 + backports
 * Debian 8
-* Debian testing (last tested Aug 7, 2016)
+* Debian stretch
 
 Pre 5/2016 revisions ran Mediawiki 1.23, tested on Fedora 20 and Ubuntu 14.04.
 
@@ -39,8 +39,12 @@ The most common route and the one taken by this site is buying a domain name fro
 
 For debian jessie with backports:
 <source lang="bash">
-apt-get install --install-suggests jessie-backports certbot
+# if we have jessie-backports, we need to use it.
+if ! apt-get install -t jessie-backports certbot python-certbot-apache; then
+    apt-get install certbot python-certbot-apache
+fi
 </source>
+
 For other distros, follow instructions at [https://certbot.eff.org/ certbot.eff.org].
 
 '''Email Setup'''
@@ -230,8 +234,12 @@ if isdeb; then
     apt-get update
     DEBIAN_FRONTEND=noninteractive apt-get install -y imagemagick curl
     if apt-get install -s mediawiki &>/dev/null; then
-        # mediawiki is packaged in jessie backports.
-        DEBIAN_FRONTEND=noninteractive apt-get -y install php5-apcu mediawiki
+        apcu=php5-apcu
+        if apt-get install -s php7.0-apcu &>/dev/null; then
+            apcu=php7.0-apcu
+        fi
+        # mediawiki is packaged in jessie backports & stretch
+        DEBIAN_FRONTEND=noninteractive apt-get -y install $apcu mediawiki
     else
         # https://www.mediawiki.org/wiki/Manual:Installation_requirements
         if apt-get install -s php7.0 &>/dev/null; then
@@ -395,6 +403,8 @@ l=$mw/../../logs
 mkdir -p $l
 temp=$(mktemp -d)
 cd $temp
+# for me, this repo is on the same server and apache needs a sec after restarting
+sleep 1
 git clone https://iankelling.org/git/basic-https-conf
 { cat <<EOF
 ServerAdmin $mw_email
@@ -512,7 +522,7 @@ EOF
 # Make the toolbox go into the drop down.
 cd $mw/skins/Vector
 if ! git remote show ian-kelling &>/dev/null; then
-    git remote add ian-kelling https://iankelling.org/git/forks/Vector
+    git remote add ian-kelling https://iankelling.org/git/mediawiki-sidebar-patch
 fi
 git fetch ian-kelling
 git checkout ian-kelling/${mw_branch}-toolbox-in-dropdown
diff --git a/mw-setup-script b/mw-setup-script
index d13c696..4755e37 100755
--- a/mw-setup-script
+++ b/mw-setup-script
@@ -3,7 +3,10 @@
 # This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
 set -x
 # <source lang="bash">
-apt-get install --install-suggests jessie-backports certbot
+# if we have jessie-backports, we need to use it.
+if ! apt-get install -t jessie-backports certbot python-certbot-apache; then
+    apt-get install certbot python-certbot-apache
+fi
 # </source>
 # <source lang="bash">
 # identify if this is a debian based distro
@@ -92,8 +95,12 @@ if isdeb; then
     apt-get update
     DEBIAN_FRONTEND=noninteractive apt-get install -y imagemagick curl
     if apt-get install -s mediawiki &>/dev/null; then
-        # mediawiki is packaged in jessie backports.
-        DEBIAN_FRONTEND=noninteractive apt-get -y install php5-apcu mediawiki
+        apcu=php5-apcu
+        if apt-get install -s php7.0-apcu &>/dev/null; then
+            apcu=php7.0-apcu
+        fi
+        # mediawiki is packaged in jessie backports & stretch
+        DEBIAN_FRONTEND=noninteractive apt-get -y install $apcu mediawiki
     else
         # https://www.mediawiki.org/wiki/Manual:Installation_requirements
         if apt-get install -s php7.0 &>/dev/null; then
@@ -192,6 +199,8 @@ l=$mw/../../logs
 mkdir -p $l
 temp=$(mktemp -d)
 cd $temp
+# for me, this repo is on the same server and apache needs a sec after restarting
+sleep 1
 git clone https://iankelling.org/git/basic-https-conf
 { cat <<EOF
 ServerAdmin $mw_email
@@ -286,7 +295,7 @@ EOF
 # Make the toolbox go into the drop down.
 cd $mw/skins/Vector
 if ! git remote show ian-kelling &>/dev/null; then
-    git remote add ian-kelling https://iankelling.org/git/forks/Vector
+    git remote add ian-kelling https://iankelling.org/git/mediawiki-sidebar-patch
 fi
 git fetch ian-kelling
 git checkout ian-kelling/${mw_branch}-toolbox-in-dropdown
-- 
2.30.2