Merge remote updates, accepting remote versions for conflicted files

services to proxy.yaml

@@ -0,0 +1,33 @@
+# This is just a list of services by ip:port that should be 
+# proxied via traefik on 192.168.4.4 (Raspberry Pi 4 4GB)
+
+bookstack: 192.168.4.11:6875
+mealie: 192.168.4.11:9000
+wordpress: 192.168.4.11:8088  Set Proxy Host to knot-u.kelinreij.duckdns.org
+backrest: 192.168.4.11:9898
+motioneye: 192.168.4.11:8081 (main web UI; additional ports 8765,9901-9904 for streams/cameras)
+dokuwiki: 192.168.4.11:8087  Set Proxy Host to wiki.kelinreij.duckdns.org
+formio: 192.168.4.11:3002   set Proxy Host to forms.kelinreij.duckdns.org
+glances: 192.168.4.11:61208
+dozzle: 192.168.4.11:8085
+dockge: 192.168.4.11:5001 set Proxy Host to jarvis.kelinreij.duckdns.org
+nextcloud: 192.168.4.11:8089 Set Proxy Host to cloud.kelinreij.duckdns.org
+kopia: 192.168.4.11:51515
+openkm: 192.168.4.11:18080
+unmanic: 192.168.4.11:8888
+gitea: 192.168.4.11:3010 (web UI; SSH on 2222)
+bitwarden: 192.168.4.11:8000
+duplicati: 192.168.4.11:8200
+
+jellyfin: 192.168.4.11:8096
+jellyseerr: 192.168.4.11:5055
+prowlarr: 192.168.4.11:9696
+radarr: 192.168.4.11:7878
+sonarr: 192.168.4.11:8989
+lidarr: 192.168.4.11:8686
+readarr: 192.168.4.11:8787
+calibre-web: 192.168.4.11:8083
+mylar3: 192.168.4.11:8090
+qbittorrent: 192.168.4.11:8080 (behind VPN)
+tdarr-server: 192.168.4.11:8265 (web UI; API on 8266)
+