iankelling.org
/
git
/
mediawiki-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get latest snapshot
[mediawiki-setup]
/
mw-setup-script
diff --git
a/mw-setup-script
b/mw-setup-script
index d13c69644db986c16cda42a6a5ddb5018b464f68..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">
# 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
# </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
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
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
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
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
# 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
fi
git fetch ian-kelling
git checkout ian-kelling/${mw_branch}-toolbox-in-dropdown