Merge pull request #56 from CanastaWiki/2.0-beta

Canasta 2.0
CanastaWiki · Dec 11, 2023 · a65eade · a65eade
2 parents a7720ef + 78d188e
commit a65eade
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/config/.gitignore b/config/.gitignore
@@ -4,3 +4,4 @@
 !.gitignore
 !composer.local.json
 !default.vcl
+!SettingsTemplate.php
diff --git a/config/Caddyfile b/config/Caddyfile
@@ -1,3 +1,3 @@
 {$MW_SITE_FQDN}:{$HTTPS_PORT}
 
-reverse_proxy varnish:80
+reverse_proxy varnish:80
diff --git a/config/SettingsTemplate.php b/config/SettingsTemplate.php
@@ -0,0 +1,8 @@
+<?php
+// If not running MediaWiki, exit
+if ( !defined( 'MEDIAWIKI' ) ) {
+	exit;
+}
+#$wgServer = "https://localhost";
+#$wgSitename = ;
+#$wgMetaNamespace = ;
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -10,7 +10,7 @@ version: '3.7'
 services:
   #db:
   #web:
-  #  image: ghcr.io/canastawiki/canasta:1.3.0
+  #  image: ghcr.io/canastawiki/canasta:latest
   #elasticsearch:
   caddy:
       ports:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       - elasticsearch
     environment:
       # Sourced from .env
-      - MW_SITE_SERVER=${MW_SITE_SERVER:-http://localhost}
+      - MW_SITE_SERVER=${MW_SITE_SERVER:-https://localhost}
       - PHP_UPLOAD_MAX_FILESIZE=${PHP_UPLOAD_MAX_FILESIZE:-10M}
       - PHP_POST_MAX_SIZE=${PHP_UPLOAD_MAX_FILESIZE:-10M}
       - PHP_MAX_INPUT_VARS=${PHP_MAX_INPUT_VARS:-1000}