Compare commits
4 Commits
master
...
renovate/c
| Author | SHA1 | Date | |
|---|---|---|---|
| c97c147d1a | |||
|
|
936d304983 | ||
|
|
eddc128ef2 | ||
|
|
e32ece8e0d |
@@ -1,4 +1,4 @@
|
|||||||
#CONFIG_FILE=/config.yaml
|
#CONFIG_FILE=/config.yaml
|
||||||
GITEA_INSTANCE_URL=https://git.example.org
|
GITEA_INSTANCE_URL=git.example.org
|
||||||
GITEA_RUNNER_REGISTRATION_TOKEN=abc
|
GITEA_RUNNER_REGISTRATION_TOKEN=abc
|
||||||
GITEA_RUNNER_NAME=runner1
|
GITEA_RUNNER_NAME=runner1
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
gitea:
|
gitea:
|
||||||
image: docker.gitea.com/gitea:1.25
|
image: docker.gitea.com/gitea:1.24.6
|
||||||
restart: always
|
restart: always
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
|||||||
29
joplin/docker-compose.yml
Normal file
29
joplin/docker-compose.yml
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
services:
|
||||||
|
db:
|
||||||
|
image: postgres:14
|
||||||
|
container_name: postgres
|
||||||
|
# ports:
|
||||||
|
# - 5433:5432
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- ./postgres:/var/lib/postgresql/data # Make database files persistent. Otherwise data is lost when the container is destroyed.
|
||||||
|
environment:
|
||||||
|
- APP_PORT=22300 # port joplin-server is reachable at
|
||||||
|
- POSTGRES_PASSWORD=mypassword123 # database password
|
||||||
|
- POSTGRES_USER=admin # database user
|
||||||
|
- POSTGRES_DB=joplin # database name
|
||||||
|
app:
|
||||||
|
image: joplin/server:latest
|
||||||
|
depends_on:
|
||||||
|
- db
|
||||||
|
ports:
|
||||||
|
- "50002:22300" # Expose internal port to LAN
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
- APP_BASE_URL=https://joplin.example.org
|
||||||
|
- DB_CLIENT=pg
|
||||||
|
- POSTGRES_PASSWORD=mypassword123
|
||||||
|
- POSTGRES_DATABASE=joplin
|
||||||
|
- POSTGRES_USER=admin
|
||||||
|
- POSTGRES_PORT=5432
|
||||||
|
- POSTGRES_HOST=db
|
||||||
@@ -10,7 +10,7 @@ services:
|
|||||||
- .env
|
- .env
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: nextcloud:32
|
image: nextcloud:31
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- 50000:80
|
- 50000:80
|
||||||
@@ -20,8 +20,3 @@ services:
|
|||||||
- ./nextcloud:/var/www/html
|
- ./nextcloud:/var/www/html
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
environment:
|
|
||||||
- REDIS_HOST=redis
|
|
||||||
redis:
|
|
||||||
image: redis
|
|
||||||
restart: always
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
server {
|
server {
|
||||||
server_name cloud.neller.org;
|
server_name cloud.example.com;
|
||||||
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains; preload";
|
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains; preload";
|
||||||
location / {
|
location / {
|
||||||
|
|
||||||
@@ -9,6 +9,8 @@ server {
|
|||||||
proxy_set_header X-Scheme $scheme;
|
proxy_set_header X-Scheme $scheme;
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
|
||||||
|
client_max_body_size 0;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
location /.well-known/carddav {
|
location /.well-known/carddav {
|
||||||
@@ -18,40 +20,25 @@ server {
|
|||||||
return 301 $scheme://$host/remote.php/dav;
|
return 301 $scheme://$host/remote.php/dav;
|
||||||
}
|
}
|
||||||
|
|
||||||
client_max_body_size 512M;
|
|
||||||
client_body_timeout 300s;
|
|
||||||
fastcgi_buffers 64 4K;
|
|
||||||
gzip on;
|
|
||||||
gzip_vary on;
|
|
||||||
gzip_comp_level 4;
|
|
||||||
gzip_min_length 256;
|
|
||||||
gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
|
|
||||||
gzip_types application/atom+xml text/javascript application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
|
|
||||||
|
|
||||||
# The setting allows you to optimize the HTTP2 bandwidth.
|
|
||||||
# See https://blog.cloudflare.com/delivering-http-2-upload-speed-improvements/
|
|
||||||
# for tuning hints
|
|
||||||
client_body_buffer_size 512k;
|
|
||||||
|
|
||||||
listen [::]:443 ssl ipv6only=on; # managed by Certbot
|
listen [::]:443 ssl ipv6only=on; # managed by Certbot
|
||||||
listen 443 ssl; # managed by Certbot
|
listen 443 ssl; # managed by Certbot
|
||||||
ssl_certificate /etc/letsencrypt/live/cloud.neller.org/fullchain.pem; # managed by Certbot
|
ssl_certificate /etc/letsencrypt/live/cloud.example.com/fullchain.pem; # managed by Certbot
|
||||||
ssl_certificate_key /etc/letsencrypt/live/cloud.neller.org/privkey.pem; # managed by Certbot
|
ssl_certificate_key /etc/letsencrypt/live/cloud.example.com/privkey.pem; # managed by Certbot
|
||||||
include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
|
include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
|
||||||
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
|
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
if ($host = cloud.neller.org) {
|
if ($host = cloud.example.com) {
|
||||||
return 301 https://$host$request_uri;
|
return 301 https://$host$request_uri;
|
||||||
} # managed by Certbot
|
} # managed by Certbot
|
||||||
|
|
||||||
|
|
||||||
server_name cloud.neller.org;
|
server_name cloud.example.com;
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
listen [::]:80;
|
||||||
|
listen 80 ;
|
||||||
return 404; # managed by Certbot
|
return 404; # managed by Certbot
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
~
|
||||||
|
|||||||
3
renovate.json
Normal file
3
renovate.json
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
|
||||||
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
name: renovate
|
|
||||||
services:
|
|
||||||
renovate:
|
|
||||||
image: renovate/renovate
|
|
||||||
volumes:
|
|
||||||
- ./config.js:/usr/src/app/config.js
|
|
||||||
environment:
|
|
||||||
- LOG_LEVEL=debug
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
platform: 'gitea',
|
|
||||||
endpoint: 'https://git.example.com/api/v1/',
|
|
||||||
token: '',
|
|
||||||
onboarding: true,
|
|
||||||
autodiscover: true,
|
|
||||||
configFileNames: [".gitea/renovate.json"]
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user