X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mw-setup-script;h=754c53664815c9afa579de61af919270c66b06c4;hb=26831bf52ab8a90dc2a3556ec91aa010dd93c530;hp=5cdfd145186b6a8775926d6e03637f847460fa41;hpb=44739bbe3f496e482d0c50d1d8012b5e15301090;p=mediawiki-setup

diff --git a/mw-setup-script b/mw-setup-script
index 5cdfd14..754c536 100755
--- a/mw-setup-script
+++ b/mw-setup-script
@@ -1,6 +1,7 @@
 #!/bin/bash
 # Copyright (C) 2016 Ian Kelling
 # This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
+set -x
 # <source lang="bash">
 # identify if this is a debian based distro
 isdeb() { command -v apt &>/dev/null; }
@@ -87,10 +88,10 @@ if isdeb; then
     # main reference:
     # https://www.mediawiki.org/wiki/Manual:Running_MediaWiki_on_Ubuntu
     apt-get update
-    apt-get install -y imagemagick
+    DEBIAN_FRONTEND=noninteractive apt-get install -y imagemagick
     if apt-get install -s mediawiki &>/dev/null; then
-        # in debian wheezy time-frame distros, mediawiki was packaged.
-        apt-get -y install php-apc mediawiki php-mbstring
+        # mediawiki is packaged in jessie backports.
+        DEBIAN_FRONTEND=noninteractive apt-get -y install php5-apcu mediawiki
     else
         # https://www.mediawiki.org/wiki/Manual:Installation_requirements
         if apt-get install -s php7.0 &>/dev/null; then
@@ -98,13 +99,15 @@ if isdeb; then
             # available in debian 8. it's listed as supported
             # in the mediawiki page.
             # noninteractive to avoid mysql password prompt.
-            DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 mysql-server \
+            DEBIAN_FRONTEND=noninteractive apt-get install -y apache2  \
+                           default-mysql-server \
                            php7.0 php7.0-mysql libapache2-mod-php7.0 php7.0-xml \
                            php7.0-apcu php7.0-mbstring
         else
             # note: mbstring is recommended, but it's not available for php5 in
             # debian jessie.
-            DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 mysql-server \
+            DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 \
+                           default-mysql-server \
                            php5 php5-mysql libapache2-mod-php5 php5-apcu
         fi
     fi
@@ -238,7 +241,6 @@ $wgArticlePath = "/wiki/$1";
 # not using nofollow is good practice, as long as we avoid spam.
 $wgNoFollowLinks = false;
 # Allow user customization.
-$wgAllowUserJs = true;
 $wgAllowUserCss = true;
 
 # use imagemagick over GD
@@ -272,10 +274,10 @@ 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/Vector
+    git remote add ian-kelling https://iankelling.org/git/forks/Vector
 fi
 git fetch ian-kelling
-git checkout ian-kelling/REL1_27-toolbox-in-dropdown
+git checkout ian-kelling/${mw_branch}-toolbox-in-dropdown
 # </source>
 # <source lang="bash">
 mw-ext Cite CiteThisPage CSS Echo Gadgets ImageMap Interwiki News \
@@ -288,7 +290,9 @@ sudo -u $apache_user php $mw/extensions/AntiSpoof/maintenance/batchAntiSpoof.php
 # </source>
 # <source lang="bash">
 mw-ext CheckUser
-sudo -u $apache_user php $mw/extensions/CheckUser/install.php; sleep 1
+if [[ -e $mw/extensions/CheckUser/install.php ]]; then
+    sudo -u $apache_user php $mw/extensions/CheckUser/install.php; sleep 1
+fi
 # </source>
 # <source lang="bash">
 if isdeb; then
@@ -532,7 +536,8 @@ div#mw-content-text {
 """)
 EOF
 
-python pwb.py ${mwfamily}_setup
+# this can spam a warning, so uniq it
+python pwb.py ${mwfamily}_setup |& uniq
 # </source>
 # <source lang="bash">
 s=/etc/cron.daily/mediawiki_update
@@ -540,33 +545,22 @@ dd of=$s<<'EOF'
 #!/bin/bash
 source ~/mw_vars
 cd $mw
-git fetch --all
-git checkout origin/$mw_branch
-cd $mw/skins/Vector
-git fetch --all -q
-x=ian-kelling/REL1_27-toolbox-in-dropdown
-log=$(git log HEAD..$x)
-if [[ $log ]]; then
-    pwd
-    echo "$log"
-fi
-git checkout -q $x
-cd $mw/extensions
-for x in *; do
-    [[ -d $x ]] || continue
-    cd $x
+for dir in extensions/* skins/* $mw; do
+    [[ -d $dir ]] || continue
+    cd $dir
+    branch=$(git describe --all)
+    branch=${branch#remotes/}
     git fetch --all -q
-    x=$(git rev-parse origin/$mw_branch 2>/dev/null) || \
-      x=$(git rev-parse origin/master)
-    log=$(git log HEAD..$x)
+    new_head=$(git rev-parse $branch)
+    log=$(git log HEAD..$new_head)
     if [[ $log ]]; then
         pwd
         echo "$log"
     fi
-    git checkout -q $x
-    cd ..
+    git checkout -q $new_head
+    cd $mw
 done
-php $mw/maintenance/update.php -q
+php $mw/maintenance/update.php -q --quick
 EOF
 
 # </source>