Updated joplin
This commit is contained in:
parent
eb0a063644
commit
a2272b367e
5
docker_config/git_update.sh
Normal file
5
docker_config/git_update.sh
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
cd /home/joey/docker_config/
|
||||||
|
git add --all
|
||||||
|
git commit -am "$(date)"
|
||||||
|
git push
|
@ -1,7 +1,7 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
joplin:
|
joplin:
|
||||||
image: joplin/server:2.0.4-beta
|
image: joplin/server:2.2.5-beta
|
||||||
container_name: joplin
|
container_name: joplin
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -15,11 +15,11 @@ li { list-style: none; margin-bottom: 2px; padding: 5px; border-bottom: 1px soli
|
|||||||
<body>
|
<body>
|
||||||
<div class='container'>
|
<div class='container'>
|
||||||
<h1>Global status</h1>
|
<h1>Global status</h1>
|
||||||
<ul><li class='panel failed-bg'>2 Outage(s)</li></ul>
|
<ul><li class='panel failed-bg'>1 Outage(s)</li></ul>
|
||||||
<h1>Services</h1>
|
<h1>Services</h1>
|
||||||
<ul>
|
<ul>
|
||||||
<li>5e.jafner.net <span class='small failed'>(Status code: 404)</span><span class='status failed'>Disrupted</span></li>
|
|
||||||
<li>traefik.jafner.net <span class='small failed'>(Status code: 401)</span><span class='status failed'>Disrupted</span></li>
|
<li>traefik.jafner.net <span class='small failed'>(Status code: 401)</span><span class='status failed'>Disrupted</span></li>
|
||||||
|
<li>5e.jafner.net <span class='status success'>Operational</span></li>
|
||||||
<li>bitwarden.jafner.net <span class='status success'>Operational</span></li>
|
<li>bitwarden.jafner.net <span class='status success'>Operational</span></li>
|
||||||
<li>calibre-dev.jafner.net <span class='status success'>Operational</span></li>
|
<li>calibre-dev.jafner.net <span class='status success'>Operational</span></li>
|
||||||
<li>calibre.jafner.net <span class='status success'>Operational</span></li>
|
<li>calibre.jafner.net <span class='status success'>Operational</span></li>
|
||||||
@ -31,6 +31,6 @@ li { list-style: none; margin-bottom: 2px; padding: 5px; border-bottom: 1px soli
|
|||||||
<li>portfolio.jafner.net <span class='status success'>Operational</span></li>
|
<li>portfolio.jafner.net <span class='status success'>Operational</span></li>
|
||||||
<li>www.jafner.net <span class='status success'>Operational</span></li>
|
<li>www.jafner.net <span class='status success'>Operational</span></li>
|
||||||
</ul>
|
</ul>
|
||||||
<p class=small> Last check: 2021-07-05T13:55:02-07:00</p>
|
<p class=small> Last check: 2021-07-08T22:05:07-07:00</p>
|
||||||
</div>
|
</div>
|
||||||
</body></html>
|
</body></html>
|
||||||
|
File diff suppressed because one or more lines are too long
@ -4,6 +4,7 @@ services:
|
|||||||
traefik:
|
traefik:
|
||||||
container_name: traefik
|
container_name: traefik
|
||||||
image: traefik:latest
|
image: traefik:latest
|
||||||
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- web
|
- web
|
||||||
- traefik
|
- traefik
|
||||||
|
1
docker_config/wikijs/.env
Normal file
1
docker_config/wikijs/.env
Normal file
@ -0,0 +1 @@
|
|||||||
|
DOCKER_DATA=/home/joey/docker_data/wikijs
|
49
docker_config/wikijs/docker-compose.yml
Normal file
49
docker_config/wikijs/docker-compose.yml
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
db:
|
||||||
|
image: postgres:11-alpine
|
||||||
|
container_name: wikijs_db
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: wiki
|
||||||
|
POSTGRES_PASSWORD: wikijsrocks
|
||||||
|
POSTGRES_USER: wikijs
|
||||||
|
networks:
|
||||||
|
- wikijs
|
||||||
|
logging:
|
||||||
|
driver: "none"
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- wikijs_db:/var/lib/postgresql/data
|
||||||
|
|
||||||
|
wiki:
|
||||||
|
image: requarks/wiki:2
|
||||||
|
container_name: wikijs_wiki
|
||||||
|
depends_on:
|
||||||
|
- db
|
||||||
|
networks:
|
||||||
|
- web
|
||||||
|
- wikijs
|
||||||
|
environment:
|
||||||
|
DB_TYPE: postgres
|
||||||
|
DB_HOST: db
|
||||||
|
DB_PORT: 5432
|
||||||
|
DB_USER: wikijs
|
||||||
|
DB_PASS: wikijsrocks
|
||||||
|
DB_NAME: wiki
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- ${PWD}/id_rsa:/id_rsa
|
||||||
|
- ${PWD}/id_rsa.pub:/id_rsa.pub
|
||||||
|
labels:
|
||||||
|
- traefik.http.routers.wikijs.rule=Host(`wikijs.jafner.net`)
|
||||||
|
- traefik.http.routers.wikijs.tls=true
|
||||||
|
- traefik.http.routers.wikijs.tls.certresolver=lets-encrypt
|
||||||
|
- traefik.http.services.wikijs.loadbalancer.server.port=3000
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
wikijs_db:
|
||||||
|
|
||||||
|
networks:
|
||||||
|
wikijs:
|
||||||
|
web:
|
||||||
|
external: true
|
49
docker_config/wikijs/id_rsa
Normal file
49
docker_config/wikijs/id_rsa
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***
|
||||||
|
***REMOVED***-
|
1
docker_config/wikijs/id_rsa.pub
Normal file
1
docker_config/wikijs/id_rsa.pub
Normal file
@ -0,0 +1 @@
|
|||||||
|
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5J5kRN6rRoYZlb4aP1frGtLmgC2aheH5pPvnhn/hj6akeRX0JA2ex+yjB0Hu/IjuCBzaBho+mY1prJeudeNVaQwVJgdW+n8p9HESI04vBNIbJwah7E7Jt8nZhVFpmhmTAff1jHr3QOWMLYV12XZ27+HItsVAWmrglgTTuU9uKXyd124mU/+8obYMAJABozMctHWB+ptsHi6ZR2A+t7dHScYp3L7BSmSvVP72OEho4YPi84wEuOF/xP/3dZ93UQnmOKL0Yc/7aJTAPJkzgrO5P8oXoUGKDFkNEF2/GLUQS8WyaJv6y+rMReyc+vLn1aeCxIx3Pk0iPadQHwUbtV6T3xby3aEre/+b0EGVI+revsEPoK/LdCnF4wsn0eAZlXVpo44gSq/TA3Qg/5eU1a1UcmG5f45RW9k6SMN5JjUJG/AOi2GsrzesUuTb5iQN0Yv98xaIHE5uU+GrJTtmVjND5QLw54pzhQujs9eRzifiDuNpx6ZHx6tyXV1OIOrF2+VAFNlIjCnQRHvJNeBRJc1o+atKGNzQ3RA/rJ9AJOZzOfnMR8cyLCI3tu6DS79udw97HciflRq0NGehad9IMnzh3MDe52e7AT/ieNhEFS+2HGUoCdmDz92+sH/6e0q2GY9mLeMwMsEj54+9oMYRVgFCT8RAer7GXMv8YyZCmF9qyAw== joey@joey-server
|
Loading…
x
Reference in New Issue
Block a user