interdiff of round #2 and #1 · pull #198 · tangled.org/core

ERROR

docker/Dockerfile

Failed to calculate interdiff for this file.

REVERTED

docker/docker-compose.yml

···

       8
       8
        
             KNOT_SERVER_SECRET: ${KNOT_SERVER_SECRET}

     

       9
       9
        
             KNOT_SERVER_DB_PATH: "/app/knotserver.db"

     

       10
       10
        
             KNOT_REPO_SCAN_PATH: "/home/git/repositories"

     

       11
       11
       -
             KNOT_SERVER_INTERNAL_LISTEN_ADDR: "localhost:5444"

     

       12
       11
        
           volumes:

     

       13
       12
        
             - "./keys:/etc/ssh/keys"

     

       14
       13
        
             - "./repositories:/home/git/repositories"

     

       15
       14
        
             - "./server:/app"

     

       16
       15
        
           ports:

     

       17
       17
       -
             - "5555:5555"

     

       18
       16
        
             - "2222:22"

     

       19
       19
       -
           restart: always

     

       20
       17
        
         frontend:

     

       21
       18
        
           image: caddy:2-alpine

     

       22
       19
        
           command: >

     
···

       27
       24
        
           depends_on:

     

       28
       25
        
             - knot

     

       29
       26
        
           ports:

     

       27
       27
       +
             - "443:443"

     

       28
       28
       +
             - "443:443/udp"

     

       30
       30
       -
             - "${KNOT_SERVER_PORT:-443}:443"

     

       31
       31
       -
             - "${KNOT_SERVER_PORT:-443}:443/udp"

     

       32
       29
        
           volumes:

     

       33
       30
        
             - caddy_data:/data

     

       34
       31
        
           restart: always

     

       32
       32
       +
       volumes:

     

       33
       33
       +
         caddy_data:

     

       35
       35
       -
           profiles: ["caddy"]

ERROR

docker/rootfs/etc/ssh/sshd_config.d/tangled_sshd.conf

Failed to calculate interdiff for this file.

REVERTED

guard/guard.go

···

       40
       40
        
       			&cli.StringFlag{

     

       41
       41
        
       				Name:  "internal-api",

     

       42
       42
        
       				Usage: "internal API endpoint",

     

       43
       43
       +
       				Value: "http://localhost:5444",

     

       43
       43
       -
       				Value: "http://localhost:5555",

     

       44
       44
        
       			},

     

       45
       45
        
       		},

     

       46
       46
        
       	}

REVERTED

keyfetch/keyfetch.go

···

       28
       28
        
       			&cli.StringFlag{

     

       29
       29
        
       				Name:  "internal-api",

     

       30
       30
        
       				Usage: "internal API endpoint",

     

       31
       31
       +
       				Value: "http://localhost:5444",

     

       31
       31
       -
       				Value: "http://127.0.0.1:5444",

     

       32
       32
        
       			},

     

       33
       33
        
       			&cli.StringFlag{

     

       34
       34
        
       				Name:  "git-dir",