back interdiff of round #2 and #1

docker: fix config #198

closed
opened by knotbin.com targeting master from [deleted fork]: fix-docker

(i be traumatized) fixes knotguard options, along with some more config improvements and fixes in docker compose and dockerfile

files
docker
rootfs
etc
ssh
sshd_config.d
guard
keyfetch
ERROR
docker/Dockerfile

Failed to calculate interdiff for this file.

REVERTED
docker/docker-compose.yml
··· 8 KNOT_SERVER_SECRET: ${KNOT_SERVER_SECRET} 9 KNOT_SERVER_DB_PATH: "/app/knotserver.db" 10 KNOT_REPO_SCAN_PATH: "/home/git/repositories" 11 - KNOT_SERVER_INTERNAL_LISTEN_ADDR: "localhost:5444" 12 volumes: 13 - "./keys:/etc/ssh/keys" 14 - "./repositories:/home/git/repositories" 15 - "./server:/app" 16 ports: 17 - - "5555:5555" 18 - "2222:22" 19 - restart: always 20 frontend: 21 image: caddy:2-alpine 22 command: > ··· 27 depends_on: 28 - knot 29 ports: 30 - - "${KNOT_SERVER_PORT:-443}:443" 31 - - "${KNOT_SERVER_PORT:-443}:443/udp" 32 volumes: 33 - caddy_data:/data 34 restart: always 35 - profiles: ["caddy"]
··· 8 KNOT_SERVER_SECRET: ${KNOT_SERVER_SECRET} 9 KNOT_SERVER_DB_PATH: "/app/knotserver.db" 10 KNOT_REPO_SCAN_PATH: "/home/git/repositories" 11 volumes: 12 - "./keys:/etc/ssh/keys" 13 - "./repositories:/home/git/repositories" 14 - "./server:/app" 15 ports: 16 - "2222:22" 17 frontend: 18 image: caddy:2-alpine 19 command: > ··· 24 depends_on: 25 - knot 26 ports: 27 + - "443:443" 28 + - "443:443/udp" 29 volumes: 30 - caddy_data:/data 31 restart: always 32 + volumes: 33 + caddy_data:
ERROR
docker/rootfs/etc/ssh/sshd_config.d/tangled_sshd.conf

Failed to calculate interdiff for this file.

REVERTED
guard/guard.go
··· 40 &cli.StringFlag{ 41 Name: "internal-api", 42 Usage: "internal API endpoint", 43 - Value: "http://localhost:5555", 44 }, 45 }, 46 }
··· 40 &cli.StringFlag{ 41 Name: "internal-api", 42 Usage: "internal API endpoint", 43 + Value: "http://localhost:5444", 44 }, 45 }, 46 }
REVERTED
keyfetch/keyfetch.go
··· 28 &cli.StringFlag{ 29 Name: "internal-api", 30 Usage: "internal API endpoint", 31 - Value: "http://127.0.0.1:5444", 32 }, 33 &cli.StringFlag{ 34 Name: "git-dir",
··· 28 &cli.StringFlag{ 29 Name: "internal-api", 30 Usage: "internal API endpoint", 31 + Value: "http://localhost:5444", 32 }, 33 &cli.StringFlag{ 34 Name: "git-dir",