iankelling.org
/
git
/
mediawiki-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update latest
[mediawiki-setup]
/
mw-setup-script
diff --git
a/mw-setup-script
b/mw-setup-script
index 9c1fd86fae7db844aa7ae4fd7d36495639fba3e1..d13c69644db986c16cda42a6a5ddb5018b464f68 100755
(executable)
--- a/
mw-setup-script
+++ b/
mw-setup-script
@@
-126,10
+126,10
@@
else
fi
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;
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 ignor
ed.
+ # only the local user root can login, and a
ny password is accept
ed.
# We answer these interactive prompts:
# Enter current password for root (enter for none):
# Set root password? [Y/n]
# We answer these interactive prompts:
# Enter current password for root (enter for none):
# Set root password? [Y/n]
@@
-188,14
+188,12
@@
$wgGroupPermissions['*']['createaccount'] = false;
EOF
# </source>
# <source lang="bash">
EOF
# </source>
# <source lang="bash">
-temp=$(mktemp -d)
-cd $temp
-git_site=https://iankelling.org/git
l=$mw/../../logs
mkdir -p $l
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
+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
ServerAdmin $mw_email
RewriteEngine On
# make the site's root url go to our main page
@@
-207,6
+205,7
@@
find -L $(readlink -f $mw) -name .htaccess \
| while read line; do
echo -e "<Directory ${line%/.htaccess}>\n $(< $line)\n</Directory>";
done
| 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>
cd
rm -rf $temp
# </source>