get latest snapshot

[mediawiki-setup] / mw-setup-script

diff --git a/mw-setup-script b/mw-setup-script
index 9c1fd86fae7db844aa7ae4fd7d36495639fba3e1..4755e37a9d49fda25858c7594d749dac07ef9d5c 100755 (executable)
--- 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
@@ -126,10 +133,10 @@ else
 fi
 
 
-# skip if we already set the root pass
+# skip if we already set the root pass and are on pre-debian 9.
 if ! echo exit|mysql -uroot "-p$dbpass"; then
     # Note: we set a root password here, but in debian 9+, it is ignored;
-    # only the local user root can login, and a password is silently ignored.
+    # only the local user root can login, and any password is accepted.
     # We answer these interactive prompts:
     # Enter current password for root (enter for none):
     # Set root password? [Y/n]
@@ -188,14 +195,14 @@ $wgGroupPermissions['*']['createaccount'] = false;
 EOF
 # </source>
 # <source lang="bash">
-temp=$(mktemp -d)
-cd $temp
-git_site=https://iankelling.org/git
 l=$mw/../../logs
 mkdir -p $l
-
-git clone $git_site/basic-https-conf
-basic-https-conf/web-conf -r ${mw%/*} - apache2 $mwdomain <<EOF
+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
 RewriteEngine On
 # make the site's root url go to our main page
@@ -207,6 +214,7 @@ find -L $(readlink -f $mw) -name .htaccess \
     | while read line; do
     echo -e "<Directory ${line%/.htaccess}>\n $(< $line)\n</Directory>";
 done
+} | basic-https-conf/web-conf -r ${mw%/*} - apache2 $mwdomain
 cd
 rm -rf $temp
 # </source>
@@ -287,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