diff --git a/docker-compose.yml b/docker-compose.yml
index 00e4789..8f78ad2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,16 @@
version: '3'
services:
+
+#== SERVICES OUTILS =======================================================================================================================
+
+ # Nineapache
+ # Reverse proxy de l'ensemble des services
+ # Seul port ouvert sur l'exterieur
nineapache:
image: reg.cadoles.com/envole/nineapache:8.1
container_name: nine-nineapache
- restart: always
+ restart: unless-stopped
healthcheck:
test: curl --fail http://localhost || exit 1
interval: 1s
@@ -17,10 +23,13 @@ services:
volumes:
- ./volume/nineapache/nine/apache.conf:/etc/apache2/conf.d/zapp.conf
+ # Mariadb
+ # Base de données des services
+ # Port interne 3306
mariadb:
image: docker.io/library/mariadb
container_name: nine-mariadb
- restart: always
+ restart: unless-stopped
healthcheck:
test: /nine/check.sh
interval: 1s
@@ -28,38 +37,40 @@ services:
env_file: ./tmp/.env.mariadb
networks:
- nine-network
- ports:
- - "3306:3306"
volumes:
- ./volume/mariadb/mysql:/var/lib/mysql
- ./volume/mariadb/nine:/nine
+ # Redis
+ # Base de données redis pour les services qui souhaitent stocker leur session en bdd
+ # Port interne 6379
redis:
image: redis:4.0
container_name: nine-redis
- ports:
- - 6379:6379
environment:
- TZ=Europe/Paris
+ # Minio
+ # Stocakge S3
+ # Port interne 9000 pour le stockage / Port interne 9001 pour l'interface web
minio:
image: minio/minio
container_name: nine-minio
- restart: always
+ restart: unless-stopped
env_file: ./tmp/.env.minio
networks:
- nine-network
- ports:
- - '7200:9000'
- - '7201:9001'
volumes:
- './volume/minio/data:/data'
command: server /data --console-address ":9001"
+ # Openldap
+ # Annuaire
+ # Port interne 1389 & 1636
openldap:
image: docker.io/bitnami/openldap:2
container_name: nine-openldap
- restart: always
+ restart: unless-stopped
healthcheck:
test: /nine/check.sh
interval: 1s
@@ -67,24 +78,17 @@ services:
env_file: ./tmp/.env.openldap
networks:
- nine-network
- ports:
- - '1389:1389'
- - '1636:1636'
- #entrypoint: /nine/debug/debug.sh
- #command: sleep 1d
volumes:
- './volume/openldap/data:/bitnami/openldap'
- './volume/openldap/nine:/nine'
+ # Keycloak
+ # serveur SSO
+ # Port interne 8999 & 8443
keycloak:
image: reg.cadoles.com/envole/keycloak:24.0.5
container_name: nine-keycloak
- restart: always
- #entrypoint: /bin/bash # Spécifiez le point d'entrée souhaité (dans cet exemple, /bin/bash)
- #command:
- #tty: true
- #stdin_open: true
-
+ restart: unless-stopped
healthcheck:
test: curl --fail http://127.0.0.1:9990 || exit 1
interval: 1s
@@ -101,27 +105,15 @@ services:
- start-dev
- --import-realm
- ninegate:
- image: reg.cadoles.com/envole/ninegate
- container_name: nine-ninegate
- restart: always
- healthcheck:
- test: curl --fail http://localhost/ninegate || exit 1
- interval: 1s
- timeout: 60s
- env_file: ./tmp/.env.ninegate
- networks:
- - nine-network
- ports:
- - "9000:80"
- volumes:
- - ./volume/ninegate/data/private:/app/uploads
- - ./volume/ninegate/data/public:/app/public/uploads
+#== SERVICES APPLICATIF =======================================================================================================================
+ # Nextcloud
+ # Hébergement de fichiers et une plateforme de collaboration
+ # Port interne 80
nextcloud:
image: reg.cadoles.com/envole/nextcloud
container_name: nine-nextcloud
- restart: always
+ restart: unless-stopped
healthcheck:
test: curl --fail http://localhost || exit 1
interval: 1s
@@ -129,8 +121,6 @@ services:
env_file: ./tmp/.env.nextcloud
networks:
- nine-network
- ports:
- - 9001:80
volumes:
- ./volume/nextcloud/html:/var/www/html
- ./volume/nextcloud/app:/var/www/html/custom_apps
@@ -138,10 +128,13 @@ services:
- ./volume/nextcloud/nine:/nine
- ./volume/nextcloud/prestart:/docker-entrypoint-hooks.d/before-starting
+ # Nineboard
+ # Tableaux de bord collaboratif
+ # Port interne 80
nineboard:
image: reg.cadoles.com/envole/nineboard
container_name: nine-nineboard
- restart: always
+ restart: unless-stopped
healthcheck:
test: curl --fail http://localhost/nineboard || exit 1
interval: 1s
@@ -149,16 +142,47 @@ services:
env_file: ./tmp/.env.nineboard
networks:
- nine-network
- ports:
- - "9002:80"
volumes:
- ./volume/nineboard/data/private:/app/uploads
- ./volume/nineboard/data/public:/app/public/uploads
+ # Ninegate
+ # Portail collaboratif
+ # Port interne 80
+ ninegate:
+ image: reg.cadoles.com/envole/ninegate
+ container_name: nine-ninegate
+ restart: unless-stopped
+ healthcheck:
+ test: curl --fail http://localhost/ninegate || exit 1
+ interval: 1s
+ timeout: 60s
+ env_file: ./tmp/.env.ninegate
+ networks:
+ - nine-network
+ volumes:
+ - ./volume/ninegate/data/private:/app/uploads
+ - ./volume/ninegate/data/public:/app/public/uploads
+
+ # Wiki.js
+ # Wiki
+ # Port interne 3000
+ wiki:
+ image: linuxserver/dokuwiki
+ container_name: nine-wiki
+ env_file: ./tmp/.env.wiki
+ networks:
+ - nine-network
+ ports:
+ - 9000:80
+
+ # Wordpress
+ # Reseau de blog
+ # Port interne 80
wordpress:
image: reg.cadoles.com/envole/wordpress
container_name: nine-wordpress
- restart: always
+ restart: unless-stopped
healthcheck:
test: curl --fail http://localhost/wordpress || exit 1
interval: 1s
@@ -168,31 +192,39 @@ services:
nine-network:
aliases:
- blog
- ports:
- - "9003:80"
volumes:
- ./volume/wordpress/data:/app/public/wp-content
+#== SERVIVES DEVELOPPEUR ==================================================================================================================
+
+ # Adminer
+ # Gestionnaire BDD
+ # Port interne 8080
adminer:
image: docker.io/library/adminer
container_name: nine-adminer
- restart: always
+ restart: unless-stopped
env_file: ./tmp/.env.adminer
networks:
- nine-network
ports:
- 9100:8080
+ # Phpldapadmin
+ # Gestionnaire Annuaire
+ # Port interne 80
phpldapadmin:
image: docker.io/osixia/phpldapadmin:latest
container_name: nine-phpldapadmin
- restart: always
+ restart: unless-stopped
env_file: ./tmp/.env.phpldapadmin
networks:
- nine-network
ports:
- "9101:80"
+#== NETWORKS ==============================================================================================================================
+
networks:
nine-network:
name: nine-network
diff --git a/env/.env b/env/.env
index 1bde0cc..5842c5f 100644
--- a/env/.env
+++ b/env/.env
@@ -18,6 +18,7 @@ PROTOCOLE=http
# ADMIN USER
ADMIN_USER=admin
ADMIN_PASSWORD=changeme
+ADMIN_EMAIL=admin@noreply.fr
# MASTERIDENTITY
# SQL or SSO or (to do LDAP)
@@ -37,6 +38,8 @@ NINEAPACHE_LOCAL=1
MARIADB_SERVICE_NAME=mariadb
MARIADB_ACTIVATE=1
MARIADB_LOCAL=1
+MARIADB_HOST=${MARIADB_SERVICE_NAME}
+MARIADB_PORT=3306
MARIADB_ROOT_PASSWORD=${ADMIN_PASSWORD}
MARIADB_USER=user
MARIADB_PASSWORD=${ADMIN_PASSWORD}
@@ -100,11 +103,11 @@ CAS_PORT=8999
CAS_PATH=/auth/realms/nine/protocol/cas
CAS_URL=${PROTOCOLE}://${CAS_HOST}:${CAS_PORT}
-# NINEGATE
-NINEGATE_SERVICE_NAME=ninegate
-NINEGATE_ACTIVATE=1
-NINEGATE_LOCAL=1
-NINEGATE_URL=${PROTOCOLE}://${WEB_URL}/ninegate
+# NINEBOARD
+NINEBOARD_SERVICE_NAME=nineboard
+NINEBOARD_ACTIVATE=1
+NINEBOARD_LOCAL=1
+NINEBOARD_URL=${PROTOCOLE}://${WEB_URL}/nineboard
# NEXTCLOUD
NEXTCLOUD_SERVICE_NAME=nextcloud
@@ -113,11 +116,17 @@ NEXTCLOUD_LOCAL=1
NEXTCLOUD_URL=${PROTOCOLE}://${WEB_URL}/nextcloud
NEXTCLOUD_SAMBA=0
-# NINEBOARD
-NINEBOARD_SERVICE_NAME=nineboard
-NINEBOARD_ACTIVATE=1
-NINEBOARD_LOCAL=1
-NINEBOARD_URL=${PROTOCOLE}://${WEB_URL}/nineboard
+# NINEGATE
+NINEGATE_SERVICE_NAME=ninegate
+NINEGATE_ACTIVATE=1
+NINEGATE_LOCAL=1
+NINEGATE_URL=${PROTOCOLE}://${WEB_URL}/ninegate
+
+# WIKI
+WIKI_SERVICE_NAME=wiki
+WIKI_ACTIVATE=1
+WIKI_LOCAL=1
+WIKI_URL=${PROTOCOLE}://${WEB_URL}/wiki
# WORDPRESS
WORDPRESS_SERVICE_NAME=wordpress
@@ -136,3 +145,4 @@ PHPLDAPADMIN_SERVICE_NAME=phpldapadmin
PHPLDAPADMIN_ACTIVATE=1
PHPLDAPADMIN_LOCAL=1
PHPLDAPADMIN_URL=${PROTOCOLE}://${WEB_URL}/phpldapadmin
+
diff --git a/env/.env.zapp.keycloak b/env/.env.zapp.keycloak
index dcd6a74..57917c2 100644
--- a/env/.env.zapp.keycloak
+++ b/env/.env.zapp.keycloak
@@ -5,7 +5,7 @@ KEYCLOAK_ADMIN=${CAS_USER}
KEYCLOAK_ADMIN_PASSWORD=${CAS_PASSWORD}
KC_DB=mariadb
-KC_DB_URL=jdbc:mariadb://${MARIADB_SERVICE_NAME}:3306/keycloak
+KC_DB_URL=jdbc:mariadb://${MARIADB_HOST}:${MARIADB_PORT}/keycloak
KC_DB_USERNAME=${MARIADB_USER}
KC_DB_PASSWORD=${MARIADB_PASSWORD}
@@ -20,3 +20,4 @@ KC_PROXY_HEADERS=xforwarded
KC_HTTP_ENABLED=true
KC_IMPORT=/nine/realm-export.json
+
diff --git a/env/.env.zapp.minio b/env/.env.zapp.minio
index dcf683e..d3c16b8 100644
--- a/env/.env.zapp.minio
+++ b/env/.env.zapp.minio
@@ -1,3 +1,7 @@
+
+# == MINIO ================================================================================================================================
+
MINIO_ROOT_USER=${ADMIN_USER}
MINIO_ROOT_PASSWORD=${ADMIN_PASSWORD}
MINIO_DEFAULT_BUCKETS=nine
+
diff --git a/env/.env.zapp.nextcloud b/env/.env.zapp.nextcloud
index 1b53403..b2ec794 100644
--- a/env/.env.zapp.nextcloud
+++ b/env/.env.zapp.nextcloud
@@ -1,7 +1,7 @@
# == NEXTCLOUD ============================================================================================================================
-MYSQL_HOST=mariadb
+MYSQL_HOST=${MARIADB_HOST}
MYSQL_DATABASE=nextcloud
MYSQL_USER=${MARIADB_USER}
MYSQL_PASSWORD=${MARIADB_PASSWORD}
diff --git a/env/.env.zapp.nineboard b/env/.env.zapp.nineboard
index 7cb2d29..69cf2f8 100644
--- a/env/.env.zapp.nineboard
+++ b/env/.env.zapp.nineboard
@@ -3,3 +3,4 @@
APP_AUTH=${MODE_AUTH}
APP_ALIAS=nineboard
+
diff --git a/env/.env.zapp.ninegate b/env/.env.zapp.ninegate
index ab8bdb2..e3d107f 100644
--- a/env/.env.zapp.ninegate
+++ b/env/.env.zapp.ninegate
@@ -20,4 +20,5 @@ WIDWORDPRESS_URL=${WORDPRESS_URL}
ACTIVATE_WIDGENCONFIG=${GENCONFIG_ACTIVATE}
WIDGENCONFIG_URL=${GENCONFIG_URL}
-INITPWDADMIN=${ADMIN_PASSWORD}
\ No newline at end of file
+INITPWDADMIN=${ADMIN_PASSWORD}
+
diff --git a/env/.env.zapp.wiki b/env/.env.zapp.wiki
new file mode 100644
index 0000000..ad11244
--- /dev/null
+++ b/env/.env.zapp.wiki
@@ -0,0 +1,29 @@
+
+# == WIKI =================================================================================================================================
+
+#DB_TYPE=mariadb
+#DB_HOST=${MARIADB_HOST}
+#DB_PORT=${MARIADB_PORT}
+#DB_USER=${MARIADB_USER}
+#DB_PASS=${MARIADB_PASSWORD}
+#DB_NAME=wiki
+#LOG_LEVEL=debug
+
+#PUID=1000
+#PGID=1000
+#TZ=Europe/Paris
+#APP_URL=${PROTOCOLE}://${WEB_URL}/${WIKI_SERVICE_NAME}
+#DB_HOST=${MARIADB_HOST}
+#DB_PORT=${MARIADB_PORT}
+#DB_USER=${MARIADB_USER}
+#DB_PASS=${MARIADB_PASSWORD}
+#DB_DATABASE=${WIKI_SERVICE_NAME}
+#APP_KEY=base64:5iSqRGawPnvl5VzRnEqV+K1ElTQ1nDt2bYayD8nh2F4=
+#ADMIN_EMAIL=${ADMIN_EMAIL}
+#ADMIN_PASSWORD=${ADMIN_PASSWORD}
+
+PUID=1000
+PGID=1000
+TZ=Europe/Paris
+DOKUWIKI_USERNAME=${ADMIN_USER}
+DOKUWIKI_PASSWORD=${ADMIN_PASSWORD}
\ No newline at end of file
diff --git a/env/.env.zapp.wordpress b/env/.env.zapp.wordpress
index 69852ac..39f265c 100644
--- a/env/.env.zapp.wordpress
+++ b/env/.env.zapp.wordpress
@@ -1,7 +1,7 @@
# == WORDPRESS ============================================================================================================================
-WORDPRESS_DB_HOST=mariadb
+WORDPRESS_DB_HOST=${MARIADB_HOST}
WORDPRESS_DB_NAME=wordpress
WORDPRESS_DB_USER=${MARIADB_USER}
WORDPRESS_DB_PASSWORD=${MARIADB_PASSWORD}
@@ -11,4 +11,5 @@ WORDPRESS_PASSWORD=${ADMIN_PASSWORD}
WORDPRESS_EMAIL=${ADMIN_USER}@noreply.fr
WORDPRESS_PROTOCOL=${PROTOCOLE}
WORDPRESS_DOMAINE=${WEB_URL}
-WORDPRESS_ALIAS=/wordpress/
\ No newline at end of file
+WORDPRESS_ALIAS=/wordpress/
+
diff --git a/misc/images/dokuwiki/containers/dokuwiki/Dockerfile b/misc/images/dokuwiki/containers/dokuwiki/Dockerfile
new file mode 100755
index 0000000..6aa22f9
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/Dockerfile
@@ -0,0 +1,18 @@
+FROM reg.cadoles.com/envole/nineapache:8.1
+
+COPY apache.conf /etc/apache2/conf.d/zapp.conf
+
+RUN cd /app
+RUN rm -rf public
+RUN wget https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz
+RUN tar zxvf dokuwiki-stable.tgz
+RUN rm dokuwiki-stable.tgz
+RUN mv dokuwiki-2024-02-06a public
+RUN chown -R apache:apache public
+RUN chmod -R 700 public/
+
+RUN cd /app/public
+
+# Installation de wp-cli
+#COPY local.php /config/dokuwiki/conf/local.php
+
diff --git a/misc/images/dokuwiki/containers/dokuwiki/apache.conf b/misc/images/dokuwiki/containers/dokuwiki/apache.conf
new file mode 100644
index 0000000..d89e1aa
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/apache.conf
@@ -0,0 +1,19 @@
+LoadModule rewrite_module modules/mod_rewrite.so
+ServerName nineapache.local
+DocumentRoot "/app/public"
+Alias /dokuwiki /app/public
+
+You've followed a link to a topic that doesn't exist yet. If permissions allow, you may create it by clicking on Create this page. +
+ +
+
+
+==== Image Links ====
+
+You can also use an image to link to another internal or external page by combining the syntax for links and [[#images_and_other_files|images]] (see below) like this:
+
+ [[http://php.net|{{wiki:dokuwiki-128.png}}]]
+
+[[http://php.net|{{wiki:dokuwiki-128.png}}]]
+
+Please note: The image formatting is the only formatting syntax accepted in link names.
+
+The whole [[#images_and_other_files|image]] and [[#links|link]] syntax is supported (including image resizing, internal and external images and URLs and interwiki links).
+
+===== Footnotes =====
+
+You can add footnotes ((This is a footnote)) by using double parentheses.
+
+ You can add footnotes ((This is a footnote)) by using double parentheses.
+
+===== Sectioning =====
+
+You can use up to five different levels of headlines to structure your content. If you have more than three headlines, a table of contents is generated automatically -- this can be disabled by including the string ''~~NOTOC~~ '' in the document.
+
+==== Headline Level 3 ====
+=== Headline Level 4 ===
+== Headline Level 5 ==
+
+ ==== Headline Level 3 ====
+ === Headline Level 4 ===
+ == Headline Level 5 ==
+
+By using four or more dashes, you can make a horizontal line:
+
+----
+
+===== Media Files =====
+
+You can include external and internal [[doku>images|images, videos and audio files]] with curly brackets. Optionally you can specify the size of them.
+
+Real size: {{wiki:dokuwiki-128.png}}
+
+Resize to given width: {{wiki:dokuwiki-128.png?50}}
+
+Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}}
+
+Resized external image: {{https://www.php.net/images/php.gif?200x50}}
+
+ Real size: {{wiki:dokuwiki-128.png}}
+ Resize to given width: {{wiki:dokuwiki-128.png?50}}
+ Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}}
+ Resized external image: {{https://www.php.net/images/php.gif?200x50}}
+
+
+By using left or right whitespaces you can choose the alignment.
+
+{{ wiki:dokuwiki-128.png}}
+
+{{wiki:dokuwiki-128.png }}
+
+{{ wiki:dokuwiki-128.png }}
+
+ {{ wiki:dokuwiki-128.png}}
+ {{wiki:dokuwiki-128.png }}
+ {{ wiki:dokuwiki-128.png }}
+
+Of course, you can add a title (displayed as a tooltip by most browsers), too.
+
+{{ wiki:dokuwiki-128.png |This is the caption}}
+
+ {{ wiki:dokuwiki-128.png |This is the caption}}
+
+For linking an image to another page see [[#Image Links]] above.
+
+==== Supported Media Formats ====
+
+DokuWiki can embed the following media formats directly.
+
+| Image | ''gif'', ''jpg'', ''png'' |
+| Video | ''webm'', ''ogv'', ''mp4'' |
+| Audio | ''ogg'', ''mp3'', ''wav'' |
+| Flash | ''swf'' |
+
+If you specify a filename that is not a supported media format, then it will be displayed as a link instead.
+
+By adding ''?linkonly'' you provide a link to the media without displaying it inline
+
+ {{wiki:dokuwiki-128.png?linkonly}}
+
+{{wiki:dokuwiki-128.png?linkonly}} This is just a link to the image.
+
+==== Fallback Formats ====
+
+Unfortunately not all browsers understand all video and audio formats. To mitigate the problem, you can upload your file in different formats for maximum browser compatibility.
+
+For example consider this embedded mp4 video:
+
+ {{video.mp4|A funny video}}
+
+When you upload a ''video.webm'' and ''video.ogv'' next to the referenced ''video.mp4'', DokuWiki will automatically add them as alternatives so that one of the three files is understood by your browser.
+
+Additionally DokuWiki supports a "poster" image which will be shown before the video has started. That image needs to have the same filename as the video and be either a jpg or png file. In the example above a ''video.jpg'' file would work.
+
+===== Lists =====
+
+Dokuwiki supports ordered and unordered lists. To create a list item, indent your text by two spaces and use a ''*'' for unordered lists or a ''-'' for ordered ones.
+
+ * This is a list
+ * The second item
+ * You may have different levels
+ * Another item
+
+ - The same list but ordered
+ - Another item
+ - Just use indention for deeper levels
+ - That's it
+
+
+ * This is a list
+ * The second item
+ * You may have different levels
+ * Another item
+
+ - The same list but ordered
+ - Another item
+ - Just use indention for deeper levels
+ - That's it
+
+
+Also take a look at the [[doku>faq:lists|FAQ on list items]].
+
+===== Text Conversions =====
+
+DokuWiki can convert certain pre-defined characters or strings into images or other text or HTML.
+
+The text to image conversion is mainly done for smileys. And the text to HTML conversion is used for typography replacements, but can be configured to use other HTML as well.
+
+==== Text to Image Conversions ====
+
+DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents. Those [[doku>Smileys]] and other images can be configured and extended. Here is an overview of Smileys included in DokuWiki:
+
+ * 8-) %% 8-) %%
+ * 8-O %% 8-O %%
+ * :-( %% :-( %%
+ * :-) %% :-) %%
+ * =) %% =) %%
+ * :-/ %% :-/ %%
+ * :-\ %% :-\ %%
+ * :-? %% :-? %%
+ * :-D %% :-D %%
+ * :-P %% :-P %%
+ * :-O %% :-O %%
+ * :-X %% :-X %%
+ * :-| %% :-| %%
+ * ;-) %% ;-) %%
+ * ^_^ %% ^_^ %%
+ * m( %% m( %%
+ * :?: %% :?: %%
+ * :!: %% :!: %%
+ * LOL %% LOL %%
+ * FIXME %% FIXME %%
+ * DELETEME %% DELETEME %%
+
+==== Text to HTML Conversions ====
+
+Typography: [[DokuWiki]] can convert simple text characters to their typographically correct entities. Here is an example of recognized characters.
+
+-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
+"He thought 'It's a man's world'..."
+
+
+-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
+"He thought 'It's a man's world'..."
+
+
+The same can be done to produce any kind of HTML, it just needs to be added to the [[doku>entities|pattern file]].
+
+There are three exceptions which do not come from that pattern file: multiplication entity (640x480), 'single' and "double quotes". They can be turned off through a [[doku>config:typography|config option]].
+
+===== Quoting =====
+
+Some times you want to mark some text to show it's a reply or comment. You can use the following syntax:
+
+
+I think we should do it
+
+> No we shouldn't
+
+>> Well, I say we should
+
+> Really?
+
+>> Yes!
+
+>>> Then lets do it!
+
+
+I think we should do it
+
+> No we shouldn't
+
+>> Well, I say we should
+
+> Really?
+
+>> Yes!
+
+>>> Then lets do it!
+
+===== Tables =====
+
+DokuWiki supports a simple syntax to create tables.
+
+^ Heading 1 ^ Heading 2 ^ Heading 3 ^
+| Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 |
+| Row 2 Col 1 | some colspan (note the double pipe) ||
+| Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 |
+
+Table rows have to start and end with a ''|'' for normal rows or a ''^'' for headers.
+
+ ^ Heading 1 ^ Heading 2 ^ Heading 3 ^
+ | Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 |
+ | Row 2 Col 1 | some colspan (note the double pipe) ||
+ | Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 |
+
+To connect cells horizontally, just make the next cell completely empty as shown above. Be sure to have always the same amount of cell separators!
+
+Vertical tableheaders are possible, too.
+
+| ^ Heading 1 ^ Heading 2 ^
+^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 |
+^ Heading 4 | no colspan this time | |
+^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 |
+
+As you can see, it's the cell separator before a cell which decides about the formatting:
+
+ | ^ Heading 1 ^ Heading 2 ^
+ ^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 |
+ ^ Heading 4 | no colspan this time | |
+ ^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 |
+
+You can have rowspans (vertically connected cells) by adding ''%%:::%%'' into the cells below the one to which they should connect.
+
+^ Heading 1 ^ Heading 2 ^ Heading 3 ^
+| Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 |
+| Row 2 Col 1 | ::: | Row 2 Col 3 |
+| Row 3 Col 1 | ::: | Row 2 Col 3 |
+
+Apart from the rowspan syntax those cells should not contain anything else.
+
+ ^ Heading 1 ^ Heading 2 ^ Heading 3 ^
+ | Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 |
+ | Row 2 Col 1 | ::: | Row 2 Col 3 |
+ | Row 3 Col 1 | ::: | Row 2 Col 3 |
+
+You can align the table contents, too. Just add at least two whitespaces at the opposite end of your text: Add two spaces on the left to align right, two spaces on the right to align left and two spaces at least at both ends for centered text.
+
+^ Table with alignment ^^^
+| right| center |left |
+|left | right| center |
+| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
+
+This is how it looks in the source:
+
+ ^ Table with alignment ^^^
+ | right| center |left |
+ |left | right| center |
+ | xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
+
+Note: Vertical alignment is not supported.
+
+===== No Formatting =====
+
+If you need to display text exactly like it is typed (without any formatting), enclose the area either with ''%%%%'' tags or even simpler, with double percent signs ''%% ''.
+
+
+This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it.
+
+The same is true for %%//__this__ text// with a smiley ;-)%%.
+
+
+ This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it.
+
+ The same is true for %%//__this__ text// with a smiley ;-)%%.
+
+===== Code Blocks =====
+
+You can include code blocks into your documents by either indenting them by at least two spaces (like used for the previous examples) or by using the tags ''%%%%'' or ''%%%%''.
+
+ This is text is indented by two spaces.
+
+
+This is preformatted code all spaces are preserved: like <-this
+
+
+
+This is pretty much the same, but you could use it to show that you quoted a file.
+
+
+Those blocks were created by this source:
+
+ This is text is indented by two spaces.
+
+
+ This is preformatted code all spaces are preserved: like <-this
+
+
+
+ This is pretty much the same, but you could use it to show that you quoted a file.
+
+
+==== Syntax Highlighting ====
+
+[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax uses the same code and file blocks described in the previous section, but this time the name of the language syntax to be highlighted is included inside the tag, e.g. ''
'' or '' ''.
+
+
+/**
+ * The HelloWorldApp class implements an application that
+ * simply displays "Hello World!" to the standard output.
+ */
+class HelloWorldApp {
+ public static void main(String[] args) {
+ System.out.println("Hello World!"); //Display the string.
+ }
+}
+
+
+The following language strings are currently recognized: //4cs 6502acme 6502kickass 6502tasm 68000devpac abap actionscript3 actionscript ada aimms algol68 apache applescript apt_sources arm asm asp asymptote autoconf autohotkey autoit avisynth awk bascomavr bash basic4gl batch bf biblatex bibtex blitzbasic bnf boo caddcl cadlisp ceylon cfdg cfm chaiscript chapel cil c_loadrunner clojure c_mac cmake cobol coffeescript c cpp cpp-qt cpp-winapi csharp css cuesheet c_winapi dart dcl dcpu16 dcs delphi diff div dos dot d ecmascript eiffel email epc e erlang euphoria ezt f1 falcon fo fortran freebasic freeswitch fsharp gambas gdb genero genie gettext glsl gml gnuplot go groovy gwbasic haskell haxe hicest hq9plus html html4strict html5 icon idl ini inno intercal io ispfpanel java5 java javascript jcl j jquery julia kixtart klonec klonecpp kotlin latex lb ldif lisp llvm locobasic logtalk lolcode lotusformulas lotusscript lscript lsl2 lua m68k magiksf make mapbasic mathematica matlab mercury metapost mirc mk-61 mmix modula2 modula3 mpasm mxml mysql nagios netrexx newlisp nginx nimrod nsis oberon2 objc objeck ocaml-brief ocaml octave oobas oorexx oracle11 oracle8 oxygene oz parasail parigp pascal pcre perl6 perl per pf phix php-brief php pic16 pike pixelbender pli plsql postgresql postscript povray powerbuilder powershell proftpd progress prolog properties providex purebasic pycon pys60 python qbasic qml q racket rails rbs rebol reg rexx robots roff rpmspec rsplus ruby rust sas sass scala scheme scilab scl sdlbasic smalltalk smarty spark sparql sql sshconfig standardml stonescript swift systemverilog tclegg tcl teraterm texgraph text thinbasic tsql twig typoscript unicon upc urbi uscript vala vbnet vb vbscript vedit verilog vhdl vim visualfoxpro visualprolog whitespace whois winbatch wolfram xbasic xml xojo xorg_conf xpp yaml z80 zxbasic//
+
+There are additional [[doku>syntax_highlighting|advanced options]] available for syntax highlighting, such as highlighting lines or adding line numbers.
+
+==== Downloadable Code Blocks ====
+
+When you use the ''%%%%'' or ''%%%%'' syntax as above, you might want to make the shown code available for download as well. You can do this by specifying a file name after language code like this:
+
+
+
+
+
+
+
+
+
+
+
+If you don't want any highlighting but want a downloadable file, specify a dash (''-'') as the language code: ''%%%%''.
+
+===== RSS/ATOM Feed Aggregation =====
+[[DokuWiki]] can integrate data from external XML feeds. For parsing the XML feeds, [[http://simplepie.org/|SimplePie]] is used. All formats understood by SimplePie can be used in DokuWiki as well. You can influence the rendering by multiple additional space separated parameters:
+
+^ Parameter ^ Description ^
+| any number | will be used as maximum number items to show, defaults to 8 |
+| reverse | display the last items in the feed first |
+| author | show item authors names |
+| date | show item dates |
+| description| show the item description. All HTML tags will be stripped |
+| nosort | do not sort the items in the feed |
+| //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). |
+
+The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered.
+
+By default the feed will be sorted by date, newest items first. You can sort it by oldest first using the ''reverse'' parameter, or display the feed as is with ''nosort''.
+
+**Example:**
+
+ {{rss>http://slashdot.org/index.rss 5 author date 1h }}
+
+{{rss>http://slashdot.org/index.rss 5 author date 1h }}
+
+
+===== Control Macros =====
+
+Some syntax influences how DokuWiki renders a page without creating any output it self. The following control macros are availble:
+
+^ Macro ^ Description |
+| %%~~NOTOC~~%% | If this macro is found on the page, no table of contents will be created |
+| %%~~NOCACHE~~%% | DokuWiki caches all output by default. Sometimes this might not be wanted (eg. when the %%%% syntax above is used), adding this macro will force DokuWiki to rerender a page on every call |
+
+===== Syntax Plugins =====
+
+DokuWiki's syntax can be extended by [[doku>plugins|Plugins]]. How the installed plugins are used is described on their appropriate description pages. The following syntax plugins are available in this particular DokuWiki installation:
+
+~~INFO:syntaxplugins~~
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/data/pages/wiki/welcome.txt b/misc/images/dokuwiki/containers/dokuwiki/volumes/data/pages/wiki/welcome.txt
new file mode 100644
index 0000000..10caa7c
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/data/pages/wiki/welcome.txt
@@ -0,0 +1,30 @@
+====== Welcome to your new DokuWiki ======
+
+Congratulations, your wiki is now up and running. Here are a few more tips to get you started.
+
+Enjoy your work with DokuWiki,\\
+-- the developers
+
+===== Create your first pages =====
+
+Your wiki needs to have a start page. As long as it doesn't exist, this link will be red: [[:start]].
+
+Go on, follow that link and create the page. If you need help with using the syntax you can always refer to the [[wiki:syntax|syntax page]].
+
+You might also want to use a sidebar. To create it, just edit the [[:sidebar]] page. Everything in that page will be shown in a margin column on the side. Read our [[doku>faq:sidebar|FAQ on sidebars]] to learn more.
+
+Please be aware that not all templates support sidebars.
+
+===== Customize your Wiki =====
+
+Once you're comfortable with creating and editing pages you might want to have a look at the [[this>doku.php?do=admin&page=config|configuration settings]] (be sure to login as superuser first).
+
+You may also want to see what [[doku>plugins|plugins]] and [[doku>templates|templates]] are available at DokuWiki.org to extend the functionality and looks of your DokuWiki installation.
+
+===== Join the Community =====
+
+DokuWiki is an Open Source project that thrives through user contributions. A good way to stay informed on what's going on and to get useful tips in using DokuWiki is subscribing to the [[doku>newsletter]].
+
+The [[https://forum.dokuwiki.org|DokuWiki User Forum]] is an excellent way to get in contact with other DokuWiki users and is just one of the many ways to get [[doku>faq:support|support]].
+
+Of course we'd be more than happy to have you [[doku>teams:getting_involved|getting involved]] with DokuWiki.
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/data/tmp/_dummy b/misc/images/dokuwiki/containers/dokuwiki/volumes/data/tmp/_dummy
new file mode 100644
index 0000000..e492265
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/data/tmp/_dummy
@@ -0,0 +1 @@
+You can safely delete this file.
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/acl b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/acl
new file mode 120000
index 0000000..163207b
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/acl
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/acl
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/action.php b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/action.php
new file mode 120000
index 0000000..e1215a7
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/action.php
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/action.php
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/admin.php b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/admin.php
new file mode 120000
index 0000000..4c19d31
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/admin.php
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/admin.php
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/auth.php b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/auth.php
new file mode 120000
index 0000000..9ea70a8
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/auth.php
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/auth.php
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authad b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authad
new file mode 120000
index 0000000..9aacb4d
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authad
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/authad
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authldap b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authldap
new file mode 120000
index 0000000..8dc63f8
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authldap
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/authldap
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authpdo b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authpdo
new file mode 120000
index 0000000..05ac952
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authpdo
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/authpdo
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authplain b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authplain
new file mode 120000
index 0000000..14dc36a
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/authplain
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/authplain
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/cli.php b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/cli.php
new file mode 120000
index 0000000..2303e45
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/cli.php
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/cli.php
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/config b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/config
new file mode 120000
index 0000000..32e1bbf
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/config
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/config
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/extension b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/extension
new file mode 120000
index 0000000..ce22025
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/extension
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/extension
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/index.html b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/index.html
new file mode 120000
index 0000000..c9b6467
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/index.html
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/index.html
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/info b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/info
new file mode 120000
index 0000000..60cdda8
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/info
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/info
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/logviewer b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/logviewer
new file mode 120000
index 0000000..326840f
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/logviewer
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/logviewer
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/popularity b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/popularity
new file mode 120000
index 0000000..c46957a
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/popularity
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/popularity
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/remote.php b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/remote.php
new file mode 120000
index 0000000..147da53
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/remote.php
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/remote.php
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/revert b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/revert
new file mode 120000
index 0000000..bf729e6
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/revert
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/revert
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/safefnrecode b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/safefnrecode
new file mode 120000
index 0000000..37c7301
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/safefnrecode
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/safefnrecode
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/styling b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/styling
new file mode 120000
index 0000000..68c6610
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/styling
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/styling
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/syntax.php b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/syntax.php
new file mode 120000
index 0000000..c4614a0
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/syntax.php
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/syntax.php
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/usermanager b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/usermanager
new file mode 120000
index 0000000..2eda53f
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/plugins/usermanager
@@ -0,0 +1 @@
+/var/www/html/lib/plugins.core/usermanager
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/tpl/dokuwiki b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/tpl/dokuwiki
new file mode 120000
index 0000000..0ecdaf0
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/tpl/dokuwiki
@@ -0,0 +1 @@
+/var/www/html/lib/tpl.core/dokuwiki
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/tpl/index.php b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/tpl/index.php
new file mode 120000
index 0000000..46cb8a8
--- /dev/null
+++ b/misc/images/dokuwiki/containers/dokuwiki/volumes/lib/tpl/index.php
@@ -0,0 +1 @@
+/var/www/html/lib/tpl.core/index.php
\ No newline at end of file
diff --git a/misc/images/dokuwiki/containers/nineapache/apache.conf b/misc/images/dokuwiki/containers/nineapache/apache.conf
new file mode 100755
index 0000000..818cf2a
--- /dev/null
+++ b/misc/images/dokuwiki/containers/nineapache/apache.conf
@@ -0,0 +1,37 @@
+
+LoadModule rewrite_module modules/mod_rewrite.so
+ServerName nineapache.local
+
+ProxyRequests Off
+ProxyPreserveHost On
+
+
+ Require all granted
+
+
+ProxyPass /dokuwiki http://dokuwiki/dokuwiki retry=0 keepalive=On
+ProxyPassReverse /dokuwiki http://dokuwiki/dokuwiki retry=0
+
+RequestHeader set X-Forwarded-Host "%{HTTP_HOST}s"
+RequestHeader set X-Forwarded-Server "%{HTTP_HOST}s"
+RequestHeader set X-Forwarded-For "%{REMOTE_ADDR}s"
+RequestHeader set Host "%{HTTP_HOST}s"
+RequestHeader set X-Forwarded-Proto "http"
+
+DocumentRoot "/app/public"
+
+ Options Indexes FollowSymLinks
+ AllowOverride All
+ Require all granted
+
+ RewriteEngine On
+ RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$
+ RewriteRule .* - [E=BASE:%1]
+ RewriteCond %{HTTP:Authorization} .+
+ RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
+ RewriteCond %{ENV:REDIRECT_STATUS} =""
+ RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteRule ^ %{ENV:BASE}/index.php [L]
+
+
diff --git a/misc/images/dokuwiki/docker-compose.yml b/misc/images/dokuwiki/docker-compose.yml
new file mode 100755
index 0000000..cc70823
--- /dev/null
+++ b/misc/images/dokuwiki/docker-compose.yml
@@ -0,0 +1,29 @@
+version: '3'
+
+services:
+ nineapache:
+ image: reg.cadoles.com/envole/nineapache:8.1
+ container_name: dokuwiki-nineapache
+ restart: always
+ healthcheck:
+ test: curl --fail http://localhost || exit 1
+ interval: 1s
+ timeout: 60s
+ networks:
+ - dokuwiki-network
+ ports:
+ - "80:80"
+ volumes:
+ - ./containers/nineapache/apache.conf:/etc/apache2/conf.d/zapp.conf
+
+ dokuwiki:
+ build:
+ context: ./containers/dokuwiki
+ image: reg.cadoles.com/envole/dokuwiki
+ container_name: dokuwiki-app
+ networks:
+ - dokuwiki-network
+
+networks:
+ dokuwiki-network:
+ name: dokuwiki-network
\ No newline at end of file
diff --git a/misc/images/wordpress/containers/wordpress/entrypoint.sh b/misc/images/wordpress/containers/wordpress/entrypoint.sh
index f540e36..28956e6 100755
--- a/misc/images/wordpress/containers/wordpress/entrypoint.sh
+++ b/misc/images/wordpress/containers/wordpress/entrypoint.sh
@@ -80,6 +80,7 @@ wp site switch-language fr_FR
# Mise à jour theme / plugin / network
wp theme install twentytwentyfour --allow-root
wp theme install lowfi --allow-root
+wp theme enable lowfi --network
wp theme update --allow-root --all
wp plugin update --allow-root --all
diff --git a/nine.sh b/nine.sh
index ed94736..1427bfe 100755
--- a/nine.sh
+++ b/nine.sh
@@ -34,10 +34,13 @@ destroyall(){
destroy $MINIO_SERVICE_NAME 1
destroy $OPENLDAP_SERVICE_NAME 1
destroy $KEYCLOAK_SERVICE_NAME 1
- destroy $NINEGATE_SERVICE_NAME 1
- destroy $NINEBOARD_SERVICE_NAME 1
+
destroy $NEXTCLOUD_SERVICE_NAME 1
+ destroy $NINEBOARD_SERVICE_NAME 1
+ destroy $NINEGATE_SERVICE_NAME 1
+ destroy $WIKI_SERVICE_NAME 1
destroy $WORDPRESS_SERVICE_NAME 1
+
destroy $ADMINER_SERVICE_NAME 1
destroy $PHPLDAPADMIN_SERVICE_NAME 1
fi
@@ -64,10 +67,13 @@ envall(){
env $MINIO_SERVICE_NAME
env $OPENLDAP_SERVICE_NAME
env $KEYCLOAK_SERVICE_NAME
- env $NINEGATE_SERVICE_NAME
- env $NINEBOARD_SERVICE_NAME
+
env $NEXTCLOUD_SERVICE_NAME
+ env $NINEBOARD_SERVICE_NAME
+ env $NINEGATE_SERVICE_NAME
+ env $WIKI_SERVICE_NAME
env $WORDPRESS_SERVICE_NAME
+
env $ADMINER_SERVICE_NAME
env $PHPLDAPADMIN_SERVICE_NAME
}
@@ -191,24 +197,25 @@ function upkeycloak {
fi
}
-function upninegate {
- if [[ $NINEGATE_ACTIVATE == 1 && $NINEGATE_LOCAL == 1 ]]
+
+function upnextcloud {
+ if [[ $NEXTCLOUD_ACTIVATE == 1 && $NEXTCLOUD_LOCAL == 1 ]]
then
- Title ${NINEGATE_SERVICE_NAME^^}
+ Title ${NEXTCLOUD_SERVICE_NAME^^}
if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
then
EchoVert "DATABASE"
- Echo ${NINEGATE_SERVICE_NAME^^}
- docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $NINEGATE_SERVICE_NAME
+ Echo ${NEXTCLOUD_SERVICE_NAME^^}
Echo
+ docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $NEXTCLOUD_SERVICE_NAME
fi
EchoVert "CONTAINER"
- upservice ${NINEGATE_SERVICE_NAME}
- chmod -R a+wr ./volume/ninegate/data
+ upservice ${NEXTCLOUD_SERVICE_NAME}
Echo
- fi
+ fi
+
}
function upnineboard {
@@ -231,24 +238,43 @@ function upnineboard {
fi
}
-function upnextcloud {
- if [[ $NEXTCLOUD_ACTIVATE == 1 && $NEXTCLOUD_LOCAL == 1 ]]
+function upninegate {
+ if [[ $NINEGATE_ACTIVATE == 1 && $NINEGATE_LOCAL == 1 ]]
then
- Title ${NEXTCLOUD_SERVICE_NAME^^}
+ Title ${NINEGATE_SERVICE_NAME^^}
if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
then
EchoVert "DATABASE"
- Echo ${NEXTCLOUD_SERVICE_NAME^^}
+ Echo ${NINEGATE_SERVICE_NAME^^}
+ docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $NINEGATE_SERVICE_NAME
Echo
- docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $NEXTCLOUD_SERVICE_NAME
fi
EchoVert "CONTAINER"
- upservice ${NEXTCLOUD_SERVICE_NAME}
+ upservice ${NINEGATE_SERVICE_NAME}
+ chmod -R a+wr ./volume/ninegate/data
Echo
- fi
+ fi
+}
+function upwiki {
+ if [[ $WIKI_ACTIVATE == 1 && $WIKI_LOCAL == 1 ]]
+ then
+ Title ${WIKI_SERVICE_NAME^^}
+
+ if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
+ then
+ EchoVert "DATABASE"
+ Echo ${WIKI_SERVICE_NAME^^}
+ docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $WIKI_SERVICE_NAME
+ Echo
+ fi
+
+ EchoVert "CONTAINER"
+ upservice ${WIKI_SERVICE_NAME}
+ Echo
+ fi
}
function upwordpress {
@@ -336,14 +362,17 @@ up(){
# KEYCLOAK
upkeycloak
- # NINEGATE
- upninegate
-
+ # NEXTCLOUD
+ upnextcloud
+
# NINEBOARD
upnineboard
- # NEXTCLOUD
- upnextcloud
+ # NINEGATE
+ upninegate
+
+ # WIKI
+ upwiki
# WORDPRESS
upwordpress
@@ -374,10 +403,13 @@ destroyall(){
destroy $MINIO_SERVICE_NAME 1
destroy $OPENLDAP_SERVICE_NAME 1
destroy $KEYCLOAK_SERVICE_NAME 1
- destroy $NINEGATE_SERVICE_NAME 1
- destroy $NINEBOARD_SERVICE_NAME 1
+
destroy $NEXTCLOUD_SERVICE_NAME 1
+ destroy $NINEBOARD_SERVICE_NAME 1
+ destroy $NINEGATE_SERVICE_NAME 1
+ destroy $WIKI_SERVICE_NAME 1
destroy $WORDPRESS_SERVICE_NAME 1
+
destroy $ADMINER_SERVICE_NAME 1
destroy $PHPLDAPADMIN_SERVICE_NAME 1
fi
@@ -455,6 +487,16 @@ destroy(){
fi
fi
+ if [[ "$1" == "$WIKI_SERVICE_NAME" && $WIKI_ACTIVATE == 1 && $WIKI_LOCAL == 1 ]]
+ then
+ if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ?";fi
+ if [[ "$?" = 0 || -z $2 ]]
+ then
+ docker-compose exec $MARIADB_SERVICE_NAME /nine/delete.sh $WIKI_SERVICE_NAME
+ sudo rm -rf volume/wiki/data
+ fi
+ fi
+
if [[ "$1" == "$WORDPRESS_SERVICE_NAME" && $WORDPRESS_ACTIVATE == 1 && $WORDPRESS_LOCAL == 1 ]]
then
if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ?";fi
diff --git a/volume/nineapache/nine/apache.conf b/volume/nineapache/nine/apache.conf
index 5287e7e..2f28578 100755
--- a/volume/nineapache/nine/apache.conf
+++ b/volume/nineapache/nine/apache.conf
@@ -2,6 +2,7 @@
LoadModule rewrite_module modules/mod_rewrite.so
ServerName nineapache.local
+# Options Proxy
ProxyRequests Off
ProxyPreserveHost On
@@ -9,14 +10,20 @@ ProxyPreserveHost On
Require all granted
+RequestHeader set X-Forwarded-Host "%{HTTP_HOST}s"
+RequestHeader set X-Forwarded-Server "%{HTTP_HOST}s"
+RequestHeader set X-Forwarded-For "%{REMOTE_ADDR}s"
+RequestHeader set Host "%{HTTP_HOST}s"
+RequestHeader set X-Forwarded-Proto "http"
+
+# Services Outils
ProxyPass /auth http://keycloak:8999/auth retry=0 keepalive=On
ProxyPassReverse /auth http://keycloak:8999/auth retry=0
-ProxyPass /ninegate http://ninegate/ninegate retry=0 keepalive=On
-ProxyPassReverse /ninegate http://ninegate/ninegate retry=0
-ProxyPass /wssninegate ws://ninegate/wssninegate retry=0 keepalive=On
-ProxyPassReverse /wssninegate ws://ninegate/wssninegate retry=0
+ProxyPass /minio http://minio:9001 retry=0 keepalive=On
+ProxyPassReverse /minio http://minio:9001 retry=0
+# Services Applicatif
ProxyPass /nextcloud http://nextcloud retry=0 keepalive=On
ProxyPassReverse /nextcloud http://nextcloud retry=0
@@ -25,21 +32,25 @@ ProxyPassReverse /nineboard http://nineboard/nineboard retry=0
ProxyPass /wssnineboard ws://nineboard/wssnineboard retry=0 keepalive=On
ProxyPassReverse /wssnineboard ws://nineboard/wssnineboard retry=0
+ProxyPass /ninegate http://ninegate/ninegate retry=0 keepalive=On
+ProxyPassReverse /ninegate http://ninegate/ninegate retry=0
+ProxyPass /wssninegate ws://ninegate/wssninegate retry=0 keepalive=On
+ProxyPassReverse /wssninegate ws://ninegate/wssninegate retry=0
+
+ProxyPass /wiki http://wiki retry=0 keepalive=On
+ProxyPassReverse /wiki http://wiki retry=0
+
ProxyPass /wordpress http://wordpress/wordpress retry=0 keepalive=On
ProxyPassReverse /wordpress http://wordpress/wordpress retry=0
+# Services Développeur
ProxyPass /adminer http://adminer:8080 retry=0 keepalive=On
ProxyPassReverse /adminer http://adminer:8080 retry=0
ProxyPass /phpldapadmin http://phpldapadmin/phpldapadmin retry=0 keepalive=On
ProxyPassReverse /phpldapadmin http://phpldapadmin/phpldapadmin retry=0
-RequestHeader set X-Forwarded-Host "%{HTTP_HOST}s"
-RequestHeader set X-Forwarded-Server "%{HTTP_HOST}s"
-RequestHeader set X-Forwarded-For "%{REMOTE_ADDR}s"
-RequestHeader set Host "%{HTTP_HOST}s"
-RequestHeader set X-Forwarded-Proto "http"
-
+# Page interne au proxy
DocumentRoot "/app/public"
Options Indexes FollowSymLinks
diff --git a/volume/wiki/nine/config.yml b/volume/wiki/nine/config.yml
new file mode 100644
index 0000000..79832fe
--- /dev/null
+++ b/volume/wiki/nine/config.yml
@@ -0,0 +1,20 @@
+port: 3000
+bindIP: 0.0.0.0
+db:
+ type: $(DB_TYPE)
+ host: "$(DB_HOST)"
+ port: $(DB_PORT)
+ user: "$(DB_USER)"
+ pass: "$(DB_PASS)"
+ db: $(DB_NAME)
+ storage: $(DB_FILEPATH)
+ ssl: $(DB_SSL)
+ssl:
+ enabled: $(SSL_ACTIVE)
+ port: 3443
+ provider: letsencrypt
+ domain: $(LETSENCRYPT_DOMAIN)
+ subscriberEmail: $(LETSENCRYPT_EMAIL)
+logLevel: $(LOG_LEVEL:info)
+logFormat: $(LOG_FORMAT:default)
+ha: $(HA_ACTIVE)