From 3d89660561f27f8e5ff0107844076028628eb27f Mon Sep 17 00:00:00 2001
From: conradschulz <conradschulz@me.com>
Date: Sat, 2 Jan 2021 10:03:34 +0100
Subject: [PATCH] Added .gitignore and switched to docker-compose with bind
 mounts for data persistance and changed file upload limit to 100MB

---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 .gitignore                                    |   4 +++
 docker-compose.yml                            |  33 ++++++++++++++++++
 ...lSettings.php => example.LocalSettings.php |  14 ++++----
 example.uploads.ini                           |   4 +++
 stack.yml                                     |   9 +++--
 6 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 .gitignore
 create mode 100644 docker-compose.yml
 rename LocalSettings.php => example.LocalSettings.php (94%)
 create mode 100644 example.uploads.ini

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f32199ec273cdcea86aa9b24b77d3379e6f4c275
GIT binary patch
literal 6148
zcmeHKJ5EC}5S)cbJc%YHrLVvZtSFp-3y|;{L{JJqw6Ds!I2yB`g7Bb;L=(+Q>#^56
zwmik#w*YMQKHdUL00Z3-2Os9<`|dNlsEDJ*85_J|Grm6Vw)<K3?*Zpt;RPeM^l$wA
z&ItoP@Pudjk4@eulLAse3P=GdAO%iPplaxFeF9e$DIf*TTLJ$*G`eFioD$>H!68}z
z;)3BY&ZCzgHV+Vc;grY-&5}w?s#S|&NoTxOUN4*ylMaiUc~0GI)uCA2&UlM-SWna_
z1*E{S0++d5di}qn|Iz;+leCfoQsAr<u*Ld*z2cLqw$2{swYJe8=$`XQcjG)L9HJZ(
jqa1VL<@hF&GOziZ`@L{V3_9aMC+cUwb&*Md|5o4&C-NK&

literal 0
HcmV?d00001

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e51ca1a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+## Directories to ignore
+
+mdbdata/
+wikidata/
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..13e50f5
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,33 @@
+# MediaWiki with MariaDB
+#
+# Access via "http://localhost:8080"
+#   (or "http://$(docker-machine ip):8080" if using docker-machine)
+version: '3'
+services:
+  mediawiki:
+    image: mediawiki:lts
+    restart: always
+    ports:
+      - 8090:80
+    links:
+      - database
+    volumes:
+      - ./wikidata/images:/var/www/html/images
+      - ./wikidata/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini:ro
+      - ./wikidata/IMG_3131.png:/var/www/html/resources/assets/IMG_3131.png 
+      #- ./wikidata/extensions:/var/www/html/extensions
+      # After initial setup, download LocalSettings.php to the same directory as
+      # this yaml and uncomment the following line and use compose to restart
+      # the mediawiki service
+      - ./wikidata/LocalSettings.php:/var/www/html/LocalSettings.php
+  database:
+    image: mariadb
+    restart: always
+    environment:
+      # @see https://phabricator.wikimedia.org/source/mediawiki/browse/master/includes/DefaultSettings.php
+      MYSQL_DATABASE: rd13mediawikidb
+      MYSQL_USER: wikiuser
+      MYSQL_PASSWORD: mwdbpw
+      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+    volumes:
+      - ./mdbdata:/var/lib/mysql
diff --git a/LocalSettings.php b/example.LocalSettings.php
similarity index 94%
rename from LocalSettings.php
rename to example.LocalSettings.php
index 35b4f16..3dc0a54 100644
--- a/LocalSettings.php
+++ b/example.LocalSettings.php
@@ -19,7 +19,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 ## Uncomment this to disable output compression
 # $wgDisableOutputCompression = true;
 
-$wgSitename = "CoLa-Wiki";
+$wgSitename = "CoLa-Wissensdatenbank";
 
 ## The URL base path to the directory containing the wiki;
 ## defaults for all runtime URL paths are based off of this.
@@ -36,7 +36,7 @@ $wgResourceBasePath = $wgScriptPath;
 
 ## The URL paths to the logo.  Make sure you change this from the default,
 ## or else you'll overwrite your logo when you upgrade!
-$wgLogos = [ '1x' => "$wgResourceBasePath/resources/assets/wiki.png" ];
+$wgLogos = [ '1x' => "$wgResourceBasePath/resources/assets/IMG_3131.png" ];
 
 ## UPO means: this is also a user preference option
 
@@ -52,10 +52,10 @@ $wgEmailAuthentication = true;
 
 ## Database settings
 $wgDBtype = "mysql";
-$wgDBserver = "10.0.5.6";
-$wgDBname = "rd13_mediawiki";
+$wgDBserver = "database";
+$wgDBname = "rd13mediawikidb";
 $wgDBuser = "wikiuser";
-$wgDBpassword = "rd13mediawikidbpw";
+$wgDBpassword = "mwdbpw";
 
 # MySQL specific settings
 $wgDBprefix = "";
@@ -101,14 +101,14 @@ $wgShellLocale = "C.UTF-8";
 # Site language code, should be one of the list in ./languages/data/Names.php
 $wgLanguageCode = "de";
 
-$wgSecretKey = "492d8002caa0078d866663a42bce5b38acc1825e4c7596106ec62c97ababf3ff";
+$wgSecretKey = "fd1587e1fdc6eb88687a1d18525db92ebf214317ee4760689135f0331e05999c";
 
 # Changing this will log out all existing sessions.
 $wgAuthenticationTokenVersion = "1";
 
 # Site upgrade key. Must be set to a string (default provided) to turn on the
 # web installer while LocalSettings.php is in place
-$wgUpgradeKey = "5051c93eb9140ca8";
+$wgUpgradeKey = "2e8fbf3267405b69";
 
 ## For attaching licensing metadata to pages, and displaying an
 ## appropriate copyright notice / icon. GNU Free Documentation
diff --git a/example.uploads.ini b/example.uploads.ini
new file mode 100644
index 0000000..e4bded0
--- /dev/null
+++ b/example.uploads.ini
@@ -0,0 +1,4 @@
+upload_max_filesize = 100M
+post_max_size = 100M
+max_execution_time = 7200
+max_file_uploads = 1000
\ No newline at end of file
diff --git a/stack.yml b/stack.yml
index e8c922b..e8b511a 100644
--- a/stack.yml
+++ b/stack.yml
@@ -13,6 +13,7 @@ services:
       - database
     volumes:
       - /var/www/html/images
+      #- ./wikidata:/var/www/html
       # After initial setup, download LocalSettings.php to the same directory as
       # this yaml and uncomment the following line and use compose to restart
       # the mediawiki service
@@ -22,7 +23,9 @@ services:
     restart: always
     environment:
       # @see https://phabricator.wikimedia.org/source/mediawiki/browse/master/includes/DefaultSettings.php
-      MYSQL_DATABASE: rd13_mediawiki
+      MYSQL_DATABASE: rd13mediawikidb
       MYSQL_USER: wikiuser
-      MYSQL_PASSWORD: rd13mediawikidbpw
-      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
\ No newline at end of file
+      MYSQL_PASSWORD: mwdbpw
+      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+    volumes:
+      #- ./mdbdata:/var/lib/mysql