diff --git a/nginx-proxy-manager/letsencrypt/renewal/npm-2.conf b/nginx-proxy-manager/letsencrypt/renewal/npm-2.conf index 1aa9606..c38d7e5 100644 --- a/nginx-proxy-manager/letsencrypt/renewal/npm-2.conf +++ b/nginx-proxy-manager/letsencrypt/renewal/npm-2.conf @@ -1,4 +1,4 @@ -version = 4.1.1 +version = 5.1.0 archive_dir = /etc/letsencrypt/archive/npm-2 cert = /etc/letsencrypt/live/npm-2/cert.pem privkey = /etc/letsencrypt/live/npm-2/privkey.pem @@ -11,10 +11,10 @@ account = 020f85d8def96a90143fbf56a6214037 key_type = ecdsa elliptic_curve = secp384r1 preferred_chain = ISRG Root X1 -pref_challs = dns-01, http-01 +pref_challs = http-01, config_dir = /etc/letsencrypt work_dir = /tmp/letsencrypt-lib -logs_dir = /tmp/letsencrypt-log +logs_dir = /data/logs authenticator = webroot webroot_path = /data/letsencrypt-acme-challenge, server = https://acme-v02.api.letsencrypt.org/directory diff --git a/nginx-proxy-manager/letsencrypt/renewal/npm-3.conf b/nginx-proxy-manager/letsencrypt/renewal/npm-3.conf index d1ee060..82f6c79 100644 --- a/nginx-proxy-manager/letsencrypt/renewal/npm-3.conf +++ b/nginx-proxy-manager/letsencrypt/renewal/npm-3.conf @@ -1,4 +1,4 @@ -version = 4.1.1 +version = 5.1.0 archive_dir = /etc/letsencrypt/archive/npm-3 cert = /etc/letsencrypt/live/npm-3/cert.pem privkey = /etc/letsencrypt/live/npm-3/privkey.pem @@ -11,10 +11,10 @@ account = 020f85d8def96a90143fbf56a6214037 key_type = ecdsa elliptic_curve = secp384r1 preferred_chain = ISRG Root X1 -pref_challs = dns-01, http-01 +pref_challs = http-01, config_dir = /etc/letsencrypt work_dir = /tmp/letsencrypt-lib -logs_dir = /tmp/letsencrypt-log +logs_dir = /data/logs authenticator = webroot webroot_path = /data/letsencrypt-acme-challenge, server = https://acme-v02.api.letsencrypt.org/directory diff --git a/nginx-proxy-manager/letsencrypt/renewal/npm-5.conf b/nginx-proxy-manager/letsencrypt/renewal/npm-5.conf index 845fe89..4b12f3d 100644 --- a/nginx-proxy-manager/letsencrypt/renewal/npm-5.conf +++ b/nginx-proxy-manager/letsencrypt/renewal/npm-5.conf @@ -1,4 +1,4 @@ -version = 4.1.1 +version = 5.1.0 archive_dir = /etc/letsencrypt/archive/npm-5 cert = /etc/letsencrypt/live/npm-5/cert.pem privkey = /etc/letsencrypt/live/npm-5/privkey.pem @@ -11,10 +11,10 @@ account = 020f85d8def96a90143fbf56a6214037 key_type = ecdsa elliptic_curve = secp384r1 preferred_chain = ISRG Root X1 -pref_challs = dns-01, http-01 +pref_challs = http-01, config_dir = /etc/letsencrypt work_dir = /tmp/letsencrypt-lib -logs_dir = /tmp/letsencrypt-log +logs_dir = /data/logs authenticator = webroot webroot_path = /data/letsencrypt-acme-challenge, server = https://acme-v02.api.letsencrypt.org/directory diff --git a/nginx-proxy-manager/letsencrypt/renewal/npm-6.conf b/nginx-proxy-manager/letsencrypt/renewal/npm-6.conf index 5538005..657574d 100644 --- a/nginx-proxy-manager/letsencrypt/renewal/npm-6.conf +++ b/nginx-proxy-manager/letsencrypt/renewal/npm-6.conf @@ -1,4 +1,4 @@ -version = 4.1.1 +version = 5.1.0 archive_dir = /etc/letsencrypt/archive/npm-6 cert = /etc/letsencrypt/live/npm-6/cert.pem privkey = /etc/letsencrypt/live/npm-6/privkey.pem @@ -11,10 +11,10 @@ account = 020f85d8def96a90143fbf56a6214037 key_type = ecdsa elliptic_curve = secp384r1 preferred_chain = ISRG Root X1 -pref_challs = dns-01, http-01 +pref_challs = http-01, config_dir = /etc/letsencrypt work_dir = /tmp/letsencrypt-lib -logs_dir = /tmp/letsencrypt-log +logs_dir = /data/logs authenticator = webroot webroot_path = /data/letsencrypt-acme-challenge, server = https://acme-v02.api.letsencrypt.org/directory diff --git a/tdarr/.env b/tdarr/.env new file mode 100644 index 0000000..54d01cd --- /dev/null +++ b/tdarr/.env @@ -0,0 +1,14 @@ +# Tdarr variables + +PUID=1000 +PGID=1000 +TZ=Europe/Oslo +NODEID=docker-01_node-01 +#SERVERIP=192.168.50.70 +SERVERIP=192.168.50.201 +SERVERPORT=8266 +WEBUIPORT=8265 +USERNAME=tdarr@home.ramberg.net +PASSWORD=tdarrpass1234 +NODENAME=InternalNode-01 + diff --git a/tdarr/compose.yml b/tdarr/compose.yml new file mode 100644 index 0000000..acf9be9 --- /dev/null +++ b/tdarr/compose.yml @@ -0,0 +1,51 @@ + +# Service Name: Tdarr Server and Node +# Description : Tdarr server and node combined. +# Homepage : + +#version: "3.4" +services: + tdarr: + container_name: tdarr + image: ghcr.io/haveagitgat/tdarr:latest + restart: unless-stopped + network_mode: bridge + ports: + - ${WEBUIPORT}:8265 # webUI port + - ${SERVERPORT}:8266 # server port + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TZ} + - UMASK_SET=002 + - internalNode=true + - inContainer=true + - ffmpegVersion=7 + - nodeID=${NODEID} + - serverIP=${SERVERIP} + - serverPort=${SERVERPORT} + - webUIPort=${WEBUIPORT} + - nodeName=${NODENAME} + - auth=false + - enableDockerAutoUpdater=false + + volumes: + - /home/rcadmin/docker/tdarr/server:/app/server + - /home/rcadmin/docker/tdarr/config:/app/configs + - /home/rcadmin/docker/tdarr/logs:/app/logs + - cifs_mount_media:/media + #- cifs_mount_media/cache:/temp + #- /mnt/nfs/tower/video:/tower_media + #- /mnt/nfs/bunker/arch:/bunker_arch + #- /mnt/smb/redux/transcode/tdarr:/temp +# devices: +# - /dev/dri:/dev/dri + + +volumes: + cifs_mount_media: + driver: local + driver_opts: + type: cifs + device: //192.168.50.204/Media/Recompress + o: "username=${USERNAME},password=${PASSWORD},vers=3.0,uid=${PUID},gid=${PGID},noserverino" diff --git a/tdarr/compose_node-only.yml b/tdarr/compose_node-only.yml new file mode 100644 index 0000000..749172b --- /dev/null +++ b/tdarr/compose_node-only.yml @@ -0,0 +1,39 @@ + +# Service Name: Tdarr Node +# Description : Tdarr node only. Requires a separate server to function. +# Homepage : + +#version: "3.4" +services: + tdarr_node: + container_name: tdarr_node + image: ghcr.io/haveagitgat/tdarr_node:latest + restart: unless-stopped + network_mode: bridge + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TZ} + - UMASK_SET=002 + - nodeID=${NODEID} + - serverIP=${SERVERIP} + - serverPort=${SERVERPORT} + volumes: + - /home/rcadmin/docker/tdarr/server:/app/server + - /home/rcadmin/docker/tdarr/config:/app/configs + - /home/rcadmin/docker/tdarr/logs:/app/logs + - cifs_mount_media:/media + #- cifs_mount_media/cache:/temp + #- /mnt/nfs/tower/video:/tower_media + #- /mnt/nfs/bunker/arch:/bunker_arch + #- /mnt/smb/redux/transcode/tdarr:/temp +# devices: +# - /dev/dri:/dev/dri + +volumes: + cifs_mount_media: + driver: local + driver_opts: + type: cifs + device: //192.168.50.204/Media/Recompress + o: "username=${USERNAME},password=${PASSWORD},vers=3.0,uid=${PUID},gid=${PGID},noserverino" diff --git a/tdarr/compose_server-node.yml.org b/tdarr/compose_server-node.yml.org new file mode 100644 index 0000000..039365f --- /dev/null +++ b/tdarr/compose_server-node.yml.org @@ -0,0 +1,45 @@ +version: "3.4" +services: + tdarr: + container_name: tdarr + image: ghcr.io/haveagitgat/tdarr:latest + restart: unless-stopped + network_mode: bridge + ports: + - 8265:8265 # webUI port + - 8266:8266 # server port + environment: + - TZ=Europe/London + - PUID=${PUID} + - PGID=${PGID} + - UMASK_SET=002 + - serverIP=0.0.0.0 + - serverPort=8266 + - webUIPort=8265 + - internalNode=true + - inContainer=true + - ffmpegVersion=7 + - nodeName=MyInternalNode + - auth=false + - openBrowser=true + - maxLogSizeMB=10 + - cronPluginUpdate= + - NVIDIA_DRIVER_CAPABILITIES=all + - NVIDIA_VISIBLE_DEVICES=all + volumes: + - /docker/tdarr/server:/app/server + - /docker/tdarr/configs:/app/configs + - /docker/tdarr/logs:/app/logs + - /media:/media + - /transcode_cache:/temp + + devices: + - /dev/dri:/dev/dri + deploy: + resources: + reservations: + devices: + - driver: nvidia + count: all + capabilities: [gpu] + \ No newline at end of file diff --git a/tdarr/config/Last_Run_Tdarr_Node.txt b/tdarr/config/Last_Run_Tdarr_Node.txt new file mode 100644 index 0000000..d0a0eeb --- /dev/null +++ b/tdarr/config/Last_Run_Tdarr_Node.txt @@ -0,0 +1 @@ +Tdarr_Node \ No newline at end of file diff --git a/tdarr/config/Last_Run_Tdarr_Server.txt b/tdarr/config/Last_Run_Tdarr_Server.txt new file mode 100644 index 0000000..ad9be04 --- /dev/null +++ b/tdarr/config/Last_Run_Tdarr_Server.txt @@ -0,0 +1 @@ +Tdarr_Server \ No newline at end of file diff --git a/tdarr/config/Tdarr_Node_Config copy.json b/tdarr/config/Tdarr_Node_Config copy.json new file mode 100644 index 0000000..e6f8f7a --- /dev/null +++ b/tdarr/config/Tdarr_Node_Config copy.json @@ -0,0 +1,28 @@ +{ + "nodeName": "InternalNode-01", + "serverURL": "https://tdarr.home.ramberg.net", + "serverIP": "192.168.50.201", + "serverPort": "8266", + "handbrakePath": "", + "ffmpegPath": "", + "mkvpropeditPath": "", + "pathTranslators": [ + { + "server": "//truenas-01/Media/Recompress", + "node": "/media" + }, + { + "server": "M:/Recompress", + "node": "/media" + } + ], + "nodeType": "mapped", + "unmappedNodeCache": "/app/unmappedNodeCache", + "logLevel": "INFO", + "priority": -1, + "cronPluginUpdate": "", + "apiKey": "", + "maxLogSizeMB": 10, + "pollInterval": 2000, + "startPaused": false +} \ No newline at end of file diff --git a/tdarr/config/Tdarr_Node_Config.json b/tdarr/config/Tdarr_Node_Config.json new file mode 100644 index 0000000..6deb3f9 --- /dev/null +++ b/tdarr/config/Tdarr_Node_Config.json @@ -0,0 +1,24 @@ +{ + "nodeName": "InternalNode-01", + "serverURL": "http://192.168.50.201:8266", + "serverIP": "192.168.50.201", + "serverPort": "8266", + "handbrakePath": "", + "ffmpegPath": "", + "mkvpropeditPath": "", + "pathTranslators": [ + { + "server": "", + "node": "" + } + ], + "nodeType": "mapped", + "unmappedNodeCache": "/app/unmappedNodeCache", + "logLevel": "INFO", + "priority": -1, + "cronPluginUpdate": "", + "apiKey": "", + "maxLogSizeMB": 10, + "pollInterval": 2000, + "startPaused": false +} \ No newline at end of file diff --git a/tdarr/config/Tdarr_Server_Config.json b/tdarr/config/Tdarr_Server_Config.json new file mode 100644 index 0000000..3620912 --- /dev/null +++ b/tdarr/config/Tdarr_Server_Config.json @@ -0,0 +1,18 @@ +{ + "serverPort": "8266", + "webUIPort": "8265", + "serverIP": "192.168.50.201", + "serverBindIP": false, + "serverDualStack": false, + "handbrakePath": "", + "ffmpegPath": "", + "logLevel": "INFO", + "mkvpropeditPath": "", + "ccextractorPath": "", + "openBrowser": true, + "cronPluginUpdate": "", + "auth": false, + "authSecretKey": "tsec_1173ce0a0f5da178172d2bf1cecc85bc4814b5a377f7bf62e4b96c5ca5c4fb60", + "maxLogSizeMB": 10, + "seededApiKey": "" +} \ No newline at end of file