Compare commits

...

5 commits

Author SHA1 Message Date
ce3b0156f0 Try new Nginx config 2023-08-27 23:09:18 +02:00
0fc4a5bfd0 Add collective-score-rust-server 2023-08-27 23:07:52 +02:00
cb3c93a4f7 Increase the buffering size to a power of 2 2023-08-19 00:23:06 +02:00
a1363c0c25 Ignore network if already created 2023-08-19 00:22:46 +02:00
dc504ab035 Update Nextcloud 2023-08-19 00:22:23 +02:00
8 changed files with 87 additions and 22 deletions

View file

@ -0,0 +1,26 @@
#!/usr/bin/env fish
set -l container_name collective-score-rust-server
set -l container_volumes_dir ~/volumes/$container_name
buildah build -t $container_name:latest ~/code/collective-score
set -l db_container_name collective-score-rust-server-db
set -l db_container_volumes_dir $container_volumes_dir/db
set -l db_env_file $container_volumes_dir/.postgres.env
podman-default-create \
$db_container_name \
--network traefik \
-v $db_container_volumes_dir:/var/lib/postgresql/data:Z \
-e TZ=Europe/Berlin \
-e PGTZ=Europe/Berlin \
--env-file $db_env_file \
--label "io.containers.autoupdate=registry" \
docker.io/library/postgres:15-alpine
podman-default-create \
$container_name \
--network traefik \
-v $container_volumes_dir/data:/volumes/data:Z \
localhost/$container_name:latest

View file

@ -1,10 +1,20 @@
#!/usr/bin/env fish #!/usr/bin/env fish
set -l container_name mo8it_com set -l container_name mo8it-com
buildah build --layers -t $container_name:latest ~/code/mo8it.com mkdir -p ~/volumes/$container_name
podman run \
--rm \
-v ~/code/mo8it.com:/volumes/src:Z,ro \
-v ~/volumes/$container_name:/volumes/public:Z \
-w /volumes/src \
ghcr.io/getzola/zola:v0.17.2 build -o /volumes/public -f; or return 1
podman-default-create \ podman-default-create \
$container_name \ $container_name \
--network traefik \ --network traefik \
localhost/$container_name:latest -v ~/sync/volumes/nginx.conf:/etc/nginx/nginx.conf:z,ro \
-v ~/volumes/$container_name:/usr/share/nginx/html:Z,ro \
--label "io.containers.autoupdate=registry" \
docker.io/library/nginx:alpine

View file

@ -23,7 +23,7 @@ podman-default-create \
-v $db_container_dir:/var/lib/postgresql/data:Z \ -v $db_container_dir:/var/lib/postgresql/data:Z \
--env-file $db_env_file \ --env-file $db_env_file \
--label "io.containers.autoupdate=registry" \ --label "io.containers.autoupdate=registry" \
docker.io/library/postgres:15-alpine docker.io/library/postgres:15-alpine; or return 1
podman-default-create \ podman-default-create \
$container_name \ $container_name \
@ -32,4 +32,4 @@ podman-default-create \
-e POSTGRES_HOST=$db_container_name \ -e POSTGRES_HOST=$db_container_name \
--env-file $db_env_file \ --env-file $db_env_file \
--label "io.containers.autoupdate=registry" \ --label "io.containers.autoupdate=registry" \
docker.io/library/nextcloud:26-apache docker.io/library/nextcloud:27-apache

View file

@ -8,9 +8,7 @@ set -l certs_dir $container_volumes_dir/certs
mkdir -p $logs_dir mkdir -p $logs_dir
mkdir -p $certs_dir mkdir -p $certs_dir
if not podman network exists traefik podman network create --ignore traefik; or return 1
podman network create traefik
end
podman-default-create \ podman-default-create \
$container_name \ $container_name \

36
volumes/nginx.conf Normal file
View file

@ -0,0 +1,36 @@
user nginx;
worker_processes auto;
error_log /var/log/nginx/error.log error;
events {
worker_connections 1024;
}
http {
charset utf-8;
access_log off;
log_not_found off;
sendfile on;
tcp_nopush on;
tcp_nodelay on;
gzip on;
server_tokens off;
include /etc/nginx/mime.types;
default_type application/octet-stream;
server {
root /usr/share/nginx/html;
index index.html;
location / {
}
error_page 404 /404.html;
}
}

View file

@ -1,11 +0,0 @@
server {
listen 80;
server_name how-to-linux.mo8it.com;
location / {
root /volumes/sites/how-to-linux.mo8it.com;
index index.html;
}
error_page 404 /404.html;
}

View file

@ -124,6 +124,9 @@ http:
to_collective_score: to_collective_score:
rule: Host(`collective-score.mo8it.com`) rule: Host(`collective-score.mo8it.com`)
service: collective_score service: collective_score
to_collective_score_rust:
rule: Host(`collective-score-rust.mo8it.com`)
service: collective_score_rust
{{ $n_ttyds := 28 }} {{ $n_ttyds := 28 }}
{{ range $index, $num := until $n_ttyds }} {{ range $index, $num := until $n_ttyds }}
to_ttyd{{ $num }}: to_ttyd{{ $num }}:
@ -133,7 +136,6 @@ http:
certResolver: le certResolver: le
{{ end }} {{ end }}
services: services:
nginx: nginx:
loadBalancer: loadBalancer:
@ -190,7 +192,7 @@ http:
mo8it_com: mo8it_com:
loadBalancer: loadBalancer:
servers: servers:
- url: http://mo8it_com - url: http://mo8it-com
juna_li_com: juna_li_com:
loadBalancer: loadBalancer:
servers: servers:
@ -215,6 +217,10 @@ http:
loadBalancer: loadBalancer:
servers: servers:
- url: http://collective-score-server - url: http://collective-score-server
collective_score_rust:
loadBalancer:
servers:
- url: http://collective-score-rust-server
{{ range $index, $num := until $n_ttyds }} {{ range $index, $num := until $n_ttyds }}
ttyd{{ $num }}: ttyd{{ $num }}:
loadBalancer: loadBalancer:

View file

@ -30,7 +30,7 @@ certificatesResolvers:
accessLog: accessLog:
filePath: /volumes/logs/access.log filePath: /volumes/logs/access.log
bufferingSize: 100 bufferingSize: 128
providers: providers:
file: file: