X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mw-setup-script;h=1c356d4e587149fba6306c5994d677391b45a540;hb=62299f54b629994be2b78ca162b2ea08dc4090a5;hp=5cdfd145186b6a8775926d6e03637f847460fa41;hpb=44739bbe3f496e482d0c50d1d8012b5e15301090;p=mediawiki-setup

diff --git a/mw-setup-script b/mw-setup-script
index 5cdfd14..1c356d4 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; }
@@ -18,7 +19,7 @@ mw-clone() {
     local url=$1
     local original_pwd="$PWD"
     local name
-    local re='[^/]*/[^/]*$'
+    local re='[^/]*/[^/]*$' # last 2 parts of path
     [[ $url =~ $re ]] ||:
     target=$mw/${BASH_REMATCH[0]}
     if [[ ! -e $target/.git ]]; then
@@ -36,11 +37,10 @@ mw-clone() {
 }
 mw-ext () {
     local ext
-    for ext in "$@"; do
+    for ext; do
         mw-clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/$ext
-        if [[ -e $mw/ext/$ext/extension.json ]]; then
-            # new style extension. remove old style declaration
-            sed -i --follow-symlinks '#^require_once( "\\\$IP/extensions/\$ext/\$ext\.php" );#d' $mwc
+        if [[ -e $mw/extensions/$ext/extension.json ]]; then
+            # new style extension
             teeu $mwc <<EOF
 wfLoadExtension( '$ext' );
 EOF
@@ -87,10 +87,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 curl
     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 +98,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
@@ -146,6 +148,8 @@ fi
 # git branch -r
 git checkout -f origin/$mw_branch
 git clean -ffxd
+# apply librejs patch
+curl "https://iankelling.org/git/?p=mediawiki-librejs-patch;a=blob_plain;f=mediawiki-1.28-librejs.patch;hb=HEAD" | patch -r - -N -p1
 # Get the php libraries wmf uses. Based on:
 # https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries
 if [[ ! -e vendor/.git ]]; then
@@ -226,6 +230,7 @@ teeu $mwc<<EOF
 \$wgMainCacheType = CACHE_ACCEL;
 \$wgEnableUploads = true;
 \$wgUseInstantCommons = true;
+\$wgPingback = true;
 EOF
 # </source>
 # <source lang="bash">
@@ -238,11 +243,14 @@ $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
 $wgUseImageMagick = true;
+# manual says this is not production ready, I think that is mostly
+# because they are using MobileFrontend extension instead, which gives
+# an even cleaner more minimal view, I plan to try setting it up
+# sometime but this seems like a very nice improvement for now.
+$wgVectorResponsive = true;
 EOF
 
 
@@ -272,14 +280,14 @@ 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 \
-       Nuke ParserFunctions Poem SyntaxHighlight_GeSHi Variables
+mw-ext Cite CiteThisPage CheckUser CSS Echo Gadgets ImageMap Interwiki News \
+       Nuke ParserFunctions Poem Renameuser SyntaxHighlight_GeSHi Variables
 # </source>
 # <source lang="bash">
 mw-ext AntiSpoof
@@ -287,10 +295,6 @@ mw-ext AntiSpoof
 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
-# </source>
-# <source lang="bash">
 if isdeb; then
     apt-get -y install php-wikidiff2
     teeu $mwc <<'EOF'
@@ -532,41 +536,40 @@ 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
 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
+update() {
+    dir=$1
+    cd $mw
+    [[ -d $dir ]] || return 1
+    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)
-    if [[ $log ]]; then
-        pwd
-        echo "$log"
+    new_head=$(git rev-parse $branch)
+    log=$(git log HEAD..$new_head)
+    if [[ ! $log ]]; then
+        return 1
     fi
-    git checkout -q $x
-    cd ..
+    pwd
+    echo "$log"
+    git checkout -qf $new_head
+    cd $mw
+    return 0
+}
+for dir in extensions/* skins/* vendor; do
+    update "$dir" ||:
 done
-php $mw/maintenance/update.php -q
+if update .; then
+    curl "https://iankelling.org/git/?p=mediawiki-librejs-patch;a=blob_plain;f=mediawiki-1.28-librejs.patch;hb=HEAD" | patch -r - -N -p1
+fi
+php $mw/maintenance/update.php -q --quick
 EOF
 
 # </source>