From c822f12182a2cd47430c1986c80dfe060be65b8f Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Sun, 9 Feb 2025 15:37:34 -0700 Subject: [PATCH] dotnet sdk minecraft original-to-deterministic-hash-code --- etc/nginx/include/dotnet-sdk-8.conf | 20 +++++++ .../original-to-deterministic-hash-code.conf | 20 +++++++ etc/nginx/include/vaultwarden.conf | 3 ++ etc/nginx/sites-available/default | 5 +- etc/systemd/system/snap.certbot.renew.timer | 4 +- .../snap.vaultwarden.vaultwarden.service | 6 +-- .../ignore/minecraft-server-data.volume | 1 + .../ignore/minecraft-server.container | 52 +++++++++++++++++++ ...o-deterministic-hash-code-server.container | 30 +++++++++++ .../containers/systemd/beszel-agent.container | 2 +- .../systemd/dotnet-sdk-8-dotnet.volume | 1 + .../systemd/dotnet-sdk-8-git.volume | 1 + .../systemd/dotnet-sdk-8-ssh.volume | 1 + .../systemd/dotnet-sdk-8-vscode.volume | 1 + .../containers/systemd/dotnet-sdk-8.container | 48 +++++++++++++++++ 15 files changed, 188 insertions(+), 7 deletions(-) create mode 100644 etc/nginx/include/dotnet-sdk-8.conf create mode 100644 etc/nginx/include/original-to-deterministic-hash-code.conf create mode 100644 home/podman/.config/containers/ignore/minecraft-server-data.volume create mode 100644 home/podman/.config/containers/ignore/minecraft-server.container create mode 100644 home/podman/.config/containers/ignore/original-to-deterministic-hash-code-server.container create mode 100644 home/podman/.config/containers/systemd/dotnet-sdk-8-dotnet.volume create mode 100644 home/podman/.config/containers/systemd/dotnet-sdk-8-git.volume create mode 100644 home/podman/.config/containers/systemd/dotnet-sdk-8-ssh.volume create mode 100644 home/podman/.config/containers/systemd/dotnet-sdk-8-vscode.volume create mode 100644 home/podman/.config/containers/systemd/dotnet-sdk-8.container diff --git a/etc/nginx/include/dotnet-sdk-8.conf b/etc/nginx/include/dotnet-sdk-8.conf new file mode 100644 index 0000000..0824434 --- /dev/null +++ b/etc/nginx/include/dotnet-sdk-8.conf @@ -0,0 +1,20 @@ +server { + # touch /etc/nginx/include/dotnet-sdk-8-hash-code.phares.duckdns.org + # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/dotnet-sdk-8-hash-code.phares.duckdns.org.key -out /etc/nginx/include/dotnet-sdk-8-hash-code.phares.duckdns.org.crt -config /etc/nginx/include/dotnet-sdk-8-hash-code.phares.duckdns.org + ssl_certificate /home/podman/wild-phares/fullchain.cer; + # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; + ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; + ssl_protocols TLSv1.2 TLSv1.3; + listen 443 ssl http2; + server_name dotnet-sdk-8.phares.duckdns.org; + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://192.168.11.2:5027/; + proxy_read_timeout 600s; + proxy_send_timeout 600s; + add_header Access-Control-Allow-Origin *; + } +} \ No newline at end of file diff --git a/etc/nginx/include/original-to-deterministic-hash-code.conf b/etc/nginx/include/original-to-deterministic-hash-code.conf new file mode 100644 index 0000000..d231028 --- /dev/null +++ b/etc/nginx/include/original-to-deterministic-hash-code.conf @@ -0,0 +1,20 @@ +server { + # touch /etc/nginx/include/original-to-deterministic-hash-code.phares.duckdns.org + # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/original-to-deterministic-hash-code.phares.duckdns.org.key -out /etc/nginx/include/original-to-deterministic-hash-code.phares.duckdns.org.crt -config /etc/nginx/include/original-to-deterministic-hash-code.phares.duckdns.org + ssl_certificate /home/podman/wild-phares/fullchain.cer; + # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; + ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; + ssl_protocols TLSv1.2 TLSv1.3; + listen 443 ssl http2; + server_name original-to-deterministic.phares.duckdns.org; + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://192.168.11.2:5025/; + proxy_read_timeout 600s; + proxy_send_timeout 600s; + add_header Access-Control-Allow-Origin *; + } +} \ No newline at end of file diff --git a/etc/nginx/include/vaultwarden.conf b/etc/nginx/include/vaultwarden.conf index c688154..64bc446 100644 --- a/etc/nginx/include/vaultwarden.conf +++ b/etc/nginx/include/vaultwarden.conf @@ -30,5 +30,8 @@ server { proxy_pass https://192.168.11.2:5008/; proxy_read_timeout 600s; proxy_send_timeout 600s; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $http_connection; } } \ No newline at end of file diff --git a/etc/nginx/sites-available/default b/etc/nginx/sites-available/default index 8980695..4187298 100644 --- a/etc/nginx/sites-available/default +++ b/etc/nginx/sites-available/default @@ -24,6 +24,7 @@ include /etc/nginx/include/blinko.conf; # https://blinko.phares.duckdns.org # ht include /etc/nginx/include/cockpit.conf; # https://cockpit.phares.duckdns.org # https://127.0.0.1:9090/ include /etc/nginx/include/dashkiosk.conf; # https://dashkiosk.phares.duckdns.org # http://192.168.11.2:9400/ include /etc/nginx/include/dorico.conf; # https://dorico.phares.duckdns.org # /home/lphares/dorico +include /etc/nginx/include/dotnet-sdk-8.conf; # https://dotnet-sdk-8.phares.duckdns.org # http://192.168.11.2:5027/ include /etc/nginx/include/firefox.conf; # https://firefox.phares.duckdns.org # http://192.168.11.2:5800/ include /etc/nginx/include/gitea.conf; # https://gitea.phares.duckdns.org # http://192.168.11.2:3000/ include /etc/nginx/include/gotify.conf; # https://gotify.phares.duckdns.org # http://192.168.11.2:5016/ @@ -35,6 +36,7 @@ include /etc/nginx/include/kanbn-to-quartz.conf; # https://kanbn-to-quartz.phare include /etc/nginx/include/kuma.conf; # https://kuma.phares.duckdns.org # https://192.168.11.2:3004/ include /etc/nginx/include/linkwarden.conf; # https://linkwarden.phares.duckdns.org # http://192.168.11.2:5011/ include /etc/nginx/include/mattermost.conf; # https://mattermost.phares.duckdns.org # https://192.168.11.2:8443/ +include /etc/nginx/include/original-to-deterministic-hash-code.conf; # https://original-to-deterministic.phares.duckdns.org # http://192.168.11.2:5025/ include /etc/nginx/include/passed.conf; # https://passed.phares.duckdns.org # http://192.168.11.2:5022/ include /etc/nginx/include/pgadmin.conf; # https://pgadmin.phares.duckdns.org # https://192.168.11.2:5007/ include /etc/nginx/include/phares.conf; # https://phares.duckdns.org # /var/www/html-nginx @@ -43,4 +45,5 @@ include /etc/nginx/include/slideshow.conf; # https://slideshow.phares.duckdns.or include /etc/nginx/include/vaultwarden.conf; # https://vaultwarden.phares.duckdns.org # https://192.168.11.2:5008/ include /etc/nginx/include/warden.conf; # https://warden.phares.duckdns.org # https://192.168.11.2:5008/ include /etc/nginx/include/xandikos.conf; # https://xandikos.phares.duckdns.org # http://192.168.11.2:8000/ -# ssh root@free.file.sync.root -i C:/Users/phares/.ssh/id_ed25519 \ No newline at end of file +# ssh root@free.file.sync.root -p 22 -i C:/Users/phares/.ssh/id_ed25519 +# ssh root@free.file.sync.root -p 5026 -i C:/Users/phares/.ssh/id_ed25519 \ No newline at end of file diff --git a/etc/systemd/system/snap.certbot.renew.timer b/etc/systemd/system/snap.certbot.renew.timer index fcc5273..478a836 100644 --- a/etc/systemd/system/snap.certbot.renew.timer +++ b/etc/systemd/system/snap.certbot.renew.timer @@ -7,8 +7,8 @@ X-Snappy=yes [Timer] Unit=snap.certbot.renew.service -OnCalendar=*-*-* 11:01 -OnCalendar=*-*-* 12:54 +OnCalendar=*-*-* 05:42 +OnCalendar=*-*-* 19:22 [Install] WantedBy=timers.target diff --git a/etc/systemd/system/snap.vaultwarden.vaultwarden.service b/etc/systemd/system/snap.vaultwarden.vaultwarden.service index d0394ec..bfd795e 100644 --- a/etc/systemd/system/snap.vaultwarden.vaultwarden.service +++ b/etc/systemd/system/snap.vaultwarden.vaultwarden.service @@ -1,9 +1,9 @@ [Unit] # Auto-generated, DO NOT EDIT Description=Service for snap application vaultwarden.vaultwarden -Requires=snap-vaultwarden-158.mount +Requires=snap-vaultwarden-161.mount Wants=network.target -After=snap-vaultwarden-158.mount network.target snapd.apparmor.service +After=snap-vaultwarden-161.mount network.target snapd.apparmor.service X-Snappy=yes [Service] @@ -11,7 +11,7 @@ EnvironmentFile=-/etc/environment ExecStart=/usr/bin/snap run vaultwarden SyslogIdentifier=vaultwarden.vaultwarden Restart=on-failure -WorkingDirectory=/var/snap/vaultwarden/158 +WorkingDirectory=/var/snap/vaultwarden/161 TimeoutStopSec=30 Type=simple diff --git a/home/podman/.config/containers/ignore/minecraft-server-data.volume b/home/podman/.config/containers/ignore/minecraft-server-data.volume new file mode 100644 index 0000000..a153d05 --- /dev/null +++ b/home/podman/.config/containers/ignore/minecraft-server-data.volume @@ -0,0 +1 @@ +[Volume] \ No newline at end of file diff --git a/home/podman/.config/containers/ignore/minecraft-server.container b/home/podman/.config/containers/ignore/minecraft-server.container new file mode 100644 index 0000000..8259d85 --- /dev/null +++ b/home/podman/.config/containers/ignore/minecraft-server.container @@ -0,0 +1,52 @@ +[Container] +AutoUpdate=registry +# +ContainerName=minecraft-server +# +# Environment="MODPACK=https://mediafilez.forgecdn.net/files/6159/192/Integrated%20MC-1.4.5.zip" +Environment="CF_API_KEY=$2a$10$4YL9prKJllKmiFp./V11B.iZ3kS1p0Rv0afJTpNctfRl2j6j/vb/a" +Environment="CF_FILE_ID=6159192" +# Environment="CF_PAGE_URL=https://www.curseforge.com/minecraft/modpacks/integrated-minecraft" +Environment="CF_SLUG=integrated-minecraft" +Environment="DIFFICULTY=normal" +Environment="EULA=TRUE" +Environment="FORCE_GAMEMODE=true" +Environment="MODE=survival" +Environment="TYPE=AUTO_CURSEFORGE" +# Environment="TYPE=FORGE" +Environment="VERSION=1.20.1" +Environment= "MEMORY=6G" +# +HealthCmd=mc-health +HealthInterval=5s +HealthRetries=20 +HealthStartPeriod=1m +HealthTimeout=3s +# +Image=docker.io/itzg/minecraft-server +# Network=minecraft.network +# Pod=minecraft.pod +PodmanArgs=--attach stdin --tty +# +PublishPort=25565:25565 +# +Volume=minecraft-server-data.volume:/data:rw +Volume=/etc/localtime:/etc/localtime:ro +Volume=/etc/timezone:/etc/timezone:ro + +[Service] +Restart=no + +[Install] +WantedBy=multi-user.target default.target + +# podman pull docker.io/itzg/minecraft-server +# systemctl --user daemon-reload +# systemctl --user start minecraft-server +# systemctl --user status minecraft-server --lines=9999 +# journalctl -fu minecraft-server.service +# podman logs minecraft-server +# systemctl --user stop minecraft-server +# systemctl --user disable minecraft-server +# podman exec -ti minecraft-server /bin/sh +# podman exec -ti minecraft-server /bin/bash diff --git a/home/podman/.config/containers/ignore/original-to-deterministic-hash-code-server.container b/home/podman/.config/containers/ignore/original-to-deterministic-hash-code-server.container new file mode 100644 index 0000000..992fdde --- /dev/null +++ b/home/podman/.config/containers/ignore/original-to-deterministic-hash-code-server.container @@ -0,0 +1,30 @@ +[Container] +AutoUpdate=registry +ContainerName=original-to-deterministic-hash-code-server +Environment="ASPNETCORE_ENVIRONMENT=Production" +Image=gitea.phares.duckdns.org:443/phares3757/original-to-deterministic-hash-code:latest +# Network=original-to-deterministic-hash-code-server.network +# Pod=original-to-deterministic-hash-code-server.pod +PublishPort=5025:5001 +Volume=/etc/localtime:/etc/localtime:ro +Volume=/etc/timezone:/etc/timezone:ro +Volume=/tmp/original-to-deterministic-hash-code:/tmp/original-to-deterministic-hash-code:rw +Volume=/mnt/free-file-sync/proxmox/iCloud Photos 2024:/app/content:rw +Volume=/home/podman/.microsoft/usersecrets/2f63ace9-efe5-4b0a-9ebe-529309f33e3f/secrets.json:/app/secrets.json:ro + +[Service] +Restart=no + +[Install] +WantedBy=multi-user.target default.target + +# podman pull gitea.phares.duckdns.org:443/phares3757/original-to-deterministic-hash-code:latest +# systemctl --user daemon-reload +# systemctl --user start original-to-deterministic-hash-code-server +# systemctl --user status original-to-deterministic-hash-code-server +# journalctl -fu original-to-deterministic-hash-code-server.service +# podman logs original-to-deterministic-hash-code-server +# systemctl --user stop original-to-deterministic-hash-code-server +# systemctl --user disable original-to-deterministic-hash-code-server +# podman exec -ti original-to-deterministic-hash-code-server /bin/sh +# podman exec -ti original-to-deterministic-hash-code-server /bin/bash diff --git a/home/podman/.config/containers/systemd/beszel-agent.container b/home/podman/.config/containers/systemd/beszel-agent.container index 42a2abb..7631856 100644 --- a/home/podman/.config/containers/systemd/beszel-agent.container +++ b/home/podman/.config/containers/systemd/beszel-agent.container @@ -1,7 +1,7 @@ [Container] ContainerName=beszel-agent # Environment="user=1000" -Environment="KEY=ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKdY/QcDcSoXxY3PpcNDAV4XcP89qgtaI00Oxt5zoCuB" +Environment="KEY=ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnMy4E7xmJ5XSr7H/mNWC1o5JmTn1wkwRR6S12b/Ggr" Environment="PORT=45876" Image=docker.io/henrygd/beszel-agent:latest PublishPort=45876:45876 diff --git a/home/podman/.config/containers/systemd/dotnet-sdk-8-dotnet.volume b/home/podman/.config/containers/systemd/dotnet-sdk-8-dotnet.volume new file mode 100644 index 0000000..a153d05 --- /dev/null +++ b/home/podman/.config/containers/systemd/dotnet-sdk-8-dotnet.volume @@ -0,0 +1 @@ +[Volume] \ No newline at end of file diff --git a/home/podman/.config/containers/systemd/dotnet-sdk-8-git.volume b/home/podman/.config/containers/systemd/dotnet-sdk-8-git.volume new file mode 100644 index 0000000..a153d05 --- /dev/null +++ b/home/podman/.config/containers/systemd/dotnet-sdk-8-git.volume @@ -0,0 +1 @@ +[Volume] \ No newline at end of file diff --git a/home/podman/.config/containers/systemd/dotnet-sdk-8-ssh.volume b/home/podman/.config/containers/systemd/dotnet-sdk-8-ssh.volume new file mode 100644 index 0000000..a153d05 --- /dev/null +++ b/home/podman/.config/containers/systemd/dotnet-sdk-8-ssh.volume @@ -0,0 +1 @@ +[Volume] \ No newline at end of file diff --git a/home/podman/.config/containers/systemd/dotnet-sdk-8-vscode.volume b/home/podman/.config/containers/systemd/dotnet-sdk-8-vscode.volume new file mode 100644 index 0000000..a153d05 --- /dev/null +++ b/home/podman/.config/containers/systemd/dotnet-sdk-8-vscode.volume @@ -0,0 +1 @@ +[Volume] \ No newline at end of file diff --git a/home/podman/.config/containers/systemd/dotnet-sdk-8.container b/home/podman/.config/containers/systemd/dotnet-sdk-8.container new file mode 100644 index 0000000..9aed50b --- /dev/null +++ b/home/podman/.config/containers/systemd/dotnet-sdk-8.container @@ -0,0 +1,48 @@ +[Container] +AutoUpdate=registry +ContainerName=dotnet-sdk-8 +Environment="ASPNETCORE_ENVIRONMENT=Production" +# Exec=dotnet --info +Exec=sleep infinity +Image=mcr.microsoft.com/dotnet/sdk:8.0 +# Network=dotnet-sdk-8.network +# Pod=dotnet-sdk-8.pod +PodmanArgs=--add-host=gitea.phares.duckdns.org:192.168.11.2 +PublishPort=5027:5001 +PublishPort=5026:22 +Volume=/etc/timezone:/etc/timezone:ro +Volume=/etc/localtime:/etc/localtime:ro +Volume=dotnet-sdk-8-ssh.volume:/etc/ssh:Z +Volume=dotnet-sdk-8-git.volume:/root/git:Z +Volume=dotnet-sdk-8-dotnet.volume:/root/.dotnet:Z +Volume=dotnet-sdk-8-vscode.volume:/root/.vscode-server:Z +Volume=/home/podman/etc-ssh-ssh_config:/etc/ssh-copy/ssh_config:ro +Volume=/home/podman/.ssh/authorized_keys:/root/.ssh/authorized_keys:ro +Volume=/home/podman/etc-ssh-sshd_config.d/50-cloud-init.conf:/etc/ssh-copy/sshd_config.d/50-cloud-init.conf:ro +Volume=/mnt/free-file-sync/notes/user-secrets/8da397d4-13ec-4576-9722-3c79cad25563/secrets.json:/app/secrets.json:ro + +[Service] +Restart=no + +[Install] +WantedBy=multi-user.target default.target + +# podman pull mcr.microsoft.com/dotnet/sdk:8.0 +# systemctl --user daemon-reload +# systemctl --user start dotnet-sdk-8 +# systemctl --user status dotnet-sdk-8 --lines=999 +# journalctl -fu dotnet-sdk-8.service +# podman logs dotnet-sdk-8 +# systemctl --user stop dotnet-sdk-8 +# systemctl --user disable dotnet-sdk-8 +# podman exec -ti dotnet-sdk-8 /bin/sh +# podman exec -ti dotnet-sdk-8 /bin/bash +# +# apt update && apt install -y openssh-server nano git clang zlib1g-dev +# N +# cp /etc/ssh-copy/ssh_config /etc/ssh/ssh_config +# cp /etc/ssh-copy/sshd_config.d/50-cloud-init.conf /etc/ssh/sshd_config.d/50-cloud-init.conf +# service ssh start +# ssh root@free.file.sync.root -p 5026 -i C:/Users/phares/.ssh/id_ed25519 +# cd /root/git/ && git clone https://51f44975c8734522b2dec36c6d9a116276c6bded@gitea.phares.duckdns.org/phares3757/file-folder-helper.git +# cp /app/secrets.json /root/.microsoft/usersecrets/2f63ace9-efe5-4b0a-9ebe-529309f33e3f/secrets.json \ No newline at end of file