Commit 1fb27cae authored by Jesper Zedlitz's avatar Jesper Zedlitz
Browse files

aktueller Stand mit Datenbank-Backup und robots.txt

parent 3308bc85
......@@ -6,21 +6,23 @@ services:
links:
- mysql
ports:
# CONFIG - Change the 8181 here to expose Wikibase & MediaWiki on a different port
- "8181:80"
- "80"
depends_on:
- mysql
- elasticsearch
networks:
default:
aliases:
- wikibase.svc
# CONFIG - Add your real wikibase hostname here, for example wikibase-registry.wmflabs.org
- web
- default
labels:
- traefik.enable=true
- traefik.docker.network=web
- "traefik.http.routers.gedbas4allwikibase.rule=Host(`gedbas-test.genealogy.net`) && (PathPrefix(`/w`) || PathPrefix(`/wiki`))"
- traefik.http.routers.gedbas4allwikibase.tls=true
- traefik.http.routers.gedbas4allwikibase.tls.certresolver=letsencrypt
environment:
- DB_SERVER=mysql.svc:3306
- MW_ELASTIC_HOST=elasticsearch.svc
- MW_ELASTIC_PORT=9200
# CONFIG - Change the default values below
- MW_ADMIN_NAME=WikibaseAdmin
- MW_ADMIN_PASS=WikibaseDockerAdminPass
- MW_ADMIN_EMAIL=admin@example.com
......@@ -30,9 +32,9 @@ services:
- DB_NAME=my_wiki
- MW_SITENAME=gedbas4all
- QS_PUBLIC_SCHEME_HOST_AND_PORT=http://localhost:9191
- OAUTH_CLIENT_ID=aZvERFfF0vF3eghEw5SGXmYPuOdCAimr85JEGao8
- OAUTH_SECRET=M8yJKvweTSnlroMQe0gKTQJugk2kfhAMJh0B6X18Q4KiNxoUEcCBNCpUwOgC0aIhix0gHaHcQxz2lcK3m8nCxd8At9Un76aMzqvLzvIlLs0OcWpUxdTpnY3LPAX2TWyt
- OAUTH_CALLBACK=http://localhost:8181/wiki/Special:OAuth2Client/callback
- OAUTH_CLIENT_ID=XY8ppC8SyByQPgc1R1kdZEgjTZFAYZYn5BDPhIFi
- OAUTH_SECRET=9z4c7YH5e8uoSbxtjkRcdFs8uU03iNUrRfEVF8MM6pfRa2g0NKho3wnseyVuRBnWXeKuNyTXAwj0fYM5O3HdeoiLfCTQ5YLKW6WdXukD4Rfq2qmNJD0J5NTUKzx3UsFa
- OAUTH_CALLBACK=https://gedbas-test.genealogy.net/wiki/Special:OAuth2Client/callback
mysql:
image: mariadb:10.3
ports:
......@@ -48,29 +50,45 @@ services:
default:
aliases:
- mysql.svc
periodic-backup:
build: ./periodic-backup
environment:
MYSQL_CONTAINER_NAME: mysql
MYSQL_DATABASE: my_wiki
MYSQL_USER: 'wikiuser'
MYSQL_PASSWORD: 'sqlpass'
volumes:
- /etc/localtime:/etc/localtime:ro
- ./backup:/opt/mysql/backup
command: crond -f -d 8
wdqs-frontend:
image: wikibase/wdqs-frontend:latest
ports:
# CONFIG - Change the 8282 here to expose the Query Service UI on a different port
- "8282:80"
- "80"
depends_on:
- wdqs-proxy
networks:
default:
aliases:
- wdqs-frontend.svc
- web
- default
labels:
- traefik.enable=true
- traefik.docker.network=web
- "traefik.http.routers.gedbasquery.rule=Host(`gedbas-test.genealogy.net`) && ( PathPrefix(`/query`) || PathPrefix(`/proxy`) ) "
- traefik.http.routers.gedbasquery.tls=true
- traefik.http.routers.gedbasquery.middlewares=remove-query-from-path
environment:
- WIKIBASE_HOST=wikibase.svc
- WIKIBASE_HOST=wikibase
- WDQS_HOST=wdqs-proxy.svc
wdqs:
image: wikibase/wdqs:0.3.10
image: wikibase/wdqs:0.3.40
command: /runBlazegraph.sh
networks:
default:
aliases:
- wdqs.svc
environment:
- WIKIBASE_HOST=wikibase.svc
- WIKIBASE_HOST=wikibase
- WDQS_HOST=wdqs.svc
- WDQS_PORT=9999
expose:
......@@ -88,7 +106,7 @@ services:
aliases:
- wdqs-proxy.svc
wdqs-updater:
image: wikibase/wdqs:0.3.10
image: wikibase/wdqs:0.3.40
command: /runUpdate.sh
depends_on:
- wdqs
......@@ -98,11 +116,11 @@ services:
aliases:
- wdqs-updater.svc
environment:
- WIKIBASE_HOST=wikibase.svc
- WIKIBASE_HOST=wikibase
- WDQS_HOST=wdqs.svc
- WDQS_PORT=9999
elasticsearch:
image: wikibase/elasticsearch:5.6.14-extra
image: wikibase/elasticsearch:6.5.4-extra
networks:
default:
aliases:
......@@ -110,3 +128,24 @@ services:
environment:
discovery.type: single-node
ES_JAVA_OPTS: "-Xms512m -Xmx512m"
robots:
image: nginx:alpine
ports:
- "80"
volumes:
- ./robots.txt:/usr/share/nginx/html/robots.txt:ro
networks:
- web
labels:
- traefik.enable=true
- traefik.docker.network=web
- "traefik.http.routers.gedbasrobots.rule=Host(`gedbas-test.genealogy.net`) && Path(`/robots.txt`)"
- traefik.http.routers.gedbasrobots.tls=true
- traefik.http.routers.gedbasrobots.priority=99
networks:
web:
external: true
User-agent: *
Disallow: /
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment