no php config (?)

Dockerfile

@@ -47,14 +47,16 @@ COPY charlesreid1-config/mediawiki/LocalSettings.php /var/www/html/LocalSettings
 RUN chown -R www-data:www-data /var/www/html/LocalSettings*
 RUN chmod 600 /var/www/html/LocalSettings.php
 
+# MediaWiki Fail2ban log directory
+RUN mkdir -p /var/log/mwf2b
+RUN chown -R www-data:www-data /var/log/mwf2b
+RUN chmod 700 /var/log/mwf2b
+
 # Apache conf file
 COPY charlesreid1-config/apache/*.conf /etc/apache2/sites-enabled/
 RUN a2enmod rewrite
 RUN service apache2 restart
 
-# PHP conf file
-# https://hub.docker.com/_/php/
-#COPY config/php.ini /usr/local/etc/php/
-
-# make texvc
-CMD cd /var/www/html/extensions/Math/math && make && apache2-foreground
+## make texvc
+#CMD cd /var/www/html/extensions/Math && make && apache2-foreground
+CMD apache2-foreground

fix_LocalSettings.sh

@@ -9,7 +9,7 @@
 # just to update LocalSettings.php when it changes, we just
 # use a docker cp command to copy it into the container.
 
-NAME="pod-charlesreid1_stormy_mw_1"
+NAME="stormy_mw"
 echo "Installing LocalSettings.php into $NAME"
 docker cp charlesreid1-config/mediawiki/LocalSettings.php $NAME:/var/www/html/LocalSettings.php
 docker exec -it $NAME /bin/bash -c "chown www-data:www-data /var/www/html/LocalSettings.php"

fix_extensions_dir.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+# 
+# fix extensions dir in the mediawiki container
+#
+# in theory, we should be able to update the
+# extensions folder in d-mediawiki/charlesreid1-config,
+# but in reality this falls on its face.
+# So, we have to fix the fucking extensions directory
+# ourselves.
+set -e
+
+NAME="stormy_mw"
+EXTENSIONS="SyntaxHighlight_GeSHi ParserFunctions EmbedVideo Math Fail2banlog"
+
+echo "Replacing existing versions of MediaWiki extensions..."
+
+for EXTENSION in $EXTENSIONS; do
+    #echo "Removing old extension ${EXTENSION} from /var/www/html/extensions"
+    #docker exec -it $NAME /bin/bash -c "mv /var/www/html/extensions/${EXTENSION} /var/www/html/extensions/_${EXTENSION}"
+    #echo "Copying new extension ${EXTENSION} from d-mediawiki/charlesreid1-config/mediawiki/extensions"
+    #docker cp charlesreid1-config/mediawiki/extensions/${EXTENSION} ${NAME}:/var/www/html/extensions
+    echo "Fixing permissions on ${EXTENSION}"
+    docker exec -it $NAME /bin/bash -c "chown www-data:www-data /var/www/html/extensions/${EXTENSION}"
+    docker exec -it $NAME /bin/bash -c "chmod 755 /var/www/html/extensions/${EXTENSION}"
+done
+
+echo "Finished replacing extensions!"

fix_skins.sh

@@ -9,7 +9,7 @@
 # just to update the skin when it changes, we just
 # use a docker cp command to copy it into the container.
 
-NAME="pod-charlesreid1_stormy_mw_1"
+NAME="stormy_mw"
 echo "Installing skins into $NAME"
 docker exec -it $NAME /bin/bash -c 'rm -rf /var/www/html/skins'
 docker cp charlesreid1-config/mediawiki/skins $NAME:/var/www/html/skins