Remove wiki
This commit is contained in:
parent
099b244f9e
commit
ff2ce6dad9
@ -29,11 +29,6 @@ proxy:
|
||||
script:
|
||||
- make proxy
|
||||
|
||||
wiki:
|
||||
extends: .builds
|
||||
script:
|
||||
- make wiki
|
||||
|
||||
nextcloud:
|
||||
extends: .builds
|
||||
script:
|
||||
|
||||
24
Makefile
24
Makefile
@ -71,26 +71,6 @@ proxy-pull:
|
||||
|
||||
proxy: proxy-clean proxy-build proxy-push
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# wiki
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
WIKI = $(REGISTRY)/wiki
|
||||
|
||||
wiki-clean:
|
||||
$(ENGINE) rmi $(WIKI) || /bin/true
|
||||
|
||||
wiki-build:
|
||||
$(ENGINE) build -f dokuwiki/Dockerfile -t $(WIKI) ./dokuwiki
|
||||
|
||||
wiki-push:
|
||||
$(ENGINE) push $(WIKI)
|
||||
|
||||
wiki-pull:
|
||||
$(ENGINE) pull $(WIKI)
|
||||
|
||||
wiki: wiki-clean wiki-build wiki-push
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# nextcloud
|
||||
# -----------------------------------------------------------------------------
|
||||
@ -122,25 +102,21 @@ clean-all:
|
||||
clean-builds: \
|
||||
html-clean \
|
||||
proxy-clean \
|
||||
wiki-clean \
|
||||
nextcloud-clean
|
||||
|
||||
build-all: \
|
||||
html-build \
|
||||
proxy-build \
|
||||
wiki-build \
|
||||
nextcloud-build
|
||||
|
||||
push-all: \
|
||||
html-push \
|
||||
proxy-push \
|
||||
wiki-push \
|
||||
nextcloud-push
|
||||
|
||||
pull-all: \
|
||||
html-pull \
|
||||
proxy-pull \
|
||||
wiki-pull \
|
||||
nextcloud-pull
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
version: '2'
|
||||
|
||||
volumes:
|
||||
wiki:
|
||||
nextcloud:
|
||||
nextcloud_db:
|
||||
gitlab_config:
|
||||
@ -23,18 +22,6 @@ services:
|
||||
image: registry.wojciechkozlowski.eu/wojtek/loki/html
|
||||
restart: always
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# DokuWiki installation available at wiki.wojciechkozlowski.eu
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
wiki:
|
||||
container_name: wiki
|
||||
build: dokuwiki
|
||||
image: registry.wojciechkozlowski.eu/wojtek/loki/wiki
|
||||
volumes:
|
||||
- wiki:/var/dokuwiki-storage
|
||||
restart: always
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# NextCloud installation available at cloud.wojciechkozlowski.eu
|
||||
# ---------------------------------------------------------------------------
|
||||
@ -130,7 +117,6 @@ services:
|
||||
- 443:443
|
||||
links:
|
||||
- html
|
||||
- wiki
|
||||
- nextcloud
|
||||
- gitlab
|
||||
volumes:
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
FROM debian:stable-slim
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
RUN apt-get update && apt-get -y upgrade
|
||||
|
||||
ENV HTML_PATH /usr/share/nginx/html
|
||||
ENV DOKU_VOL /var/dokuwiki-storage
|
||||
|
||||
RUN apt-get -y install \
|
||||
wget \
|
||||
php7.3-fpm \
|
||||
php7.3-xml \
|
||||
nginx \
|
||||
supervisor
|
||||
|
||||
RUN sed -i -e "s|cgi.fix_pathinfo=1|cgi.fix_pathinfo=0|g" /etc/php/7.3/fpm/php.ini && \
|
||||
mkdir /run/php
|
||||
|
||||
RUN rm -rf /etc/nginx/sites-enabled/* && \
|
||||
rm -rf /etc/nginx/conf.d
|
||||
|
||||
RUN rm -rf $HTML_PATH && \
|
||||
mkdir $HTML_PATH && \
|
||||
mkdir $DOKU_VOL && \
|
||||
mkdir $DOKU_VOL/data && \
|
||||
cd $HTML_PATH && \
|
||||
wget https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz && \
|
||||
tar xf dokuwiki-stable.tgz --strip 1 && \
|
||||
rm dokuwiki-stable.tgz && \
|
||||
chown -R www-data:www-data ./ && \
|
||||
mv $HTML_PATH/data/pages $DOKU_VOL/data/pages && \
|
||||
ln -s $DOKU_VOL/data/pages $HTML_PATH/data/pages && \
|
||||
mv $HTML_PATH/data/meta $DOKU_VOL/data/meta && \
|
||||
ln -s $DOKU_VOL/data/meta $HTML_PATH/data/meta && \
|
||||
mv $HTML_PATH/data/media $DOKU_VOL/data/media && \
|
||||
ln -s $DOKU_VOL/data/media $HTML_PATH/data/media && \
|
||||
mv $HTML_PATH/data/media_attic $DOKU_VOL/data/media_attic && \
|
||||
ln -s $DOKU_VOL/data/media_attic $HTML_PATH/data/media_attic && \
|
||||
mv $HTML_PATH/data/media_meta $DOKU_VOL/data/media_meta && \
|
||||
ln -s $DOKU_VOL/data/media_meta $HTML_PATH/data/media_meta && \
|
||||
mv $HTML_PATH/data/attic $DOKU_VOL/data/attic && \
|
||||
ln -s $DOKU_VOL/data/attic $HTML_PATH/data/attic && \
|
||||
mv $HTML_PATH/conf $DOKU_VOL/conf && \
|
||||
ln -s $DOKU_VOL/conf $HTML_PATH/conf
|
||||
|
||||
COPY nginx-conf.d /etc/nginx/conf.d
|
||||
COPY supervisord.conf /etc/supervisord.conf
|
||||
|
||||
EXPOSE 80
|
||||
VOLUME ["$DOKU_VOL"]
|
||||
|
||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
|
||||
@ -1,31 +0,0 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name wiki.wojciechkozlowski.eu;
|
||||
|
||||
root /usr/share/nginx/html;
|
||||
index index.php index.html index.htm;
|
||||
|
||||
location / {
|
||||
index doku.php;
|
||||
try_files $uri $uri/ @dokuwiki;
|
||||
}
|
||||
|
||||
location @dokuwiki {
|
||||
rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last;
|
||||
rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last;
|
||||
rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last;
|
||||
rewrite ^/(.*) /doku.php?id=$1 last;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
try_files $uri =404;
|
||||
fastcgi_pass unix:/run/php/php7.3-fpm.sock;
|
||||
fastcgi_index index.php;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
include fastcgi_params;
|
||||
}
|
||||
|
||||
location ~ /(data|conf|bin|inc)/ {
|
||||
deny all;
|
||||
}
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
|
||||
[supervisorctl]
|
||||
serverurl=unix:///var/run/supervisor.sock
|
||||
|
||||
[unix_http_server]
|
||||
file=/var/run/supervisor.sock
|
||||
|
||||
[rpcinterface:supervisor]
|
||||
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
|
||||
|
||||
[program:php]
|
||||
command=/usr/sbin/php-fpm7.3 --nodaemonize
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
redirect_stderr=true
|
||||
|
||||
[program:nginx]
|
||||
command=/usr/sbin/nginx -g "daemon off;"
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
redirect_stderr=true
|
||||
@ -6,26 +6,4 @@ server {
|
||||
allow all;
|
||||
root /var/www/html;
|
||||
}
|
||||
|
||||
location / {
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name wiki.wojciechkozlowski.eu;
|
||||
|
||||
location / {
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
proxy_set_header Host $host;
|
||||
proxy_pass http://wiki;
|
||||
}
|
||||
|
||||
error_page 500 502 503 504 /50x.html;
|
||||
location = /50x.html {
|
||||
root /usr/share/nginx/html;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user