diff --git a/services/navidrome/.env b/services/navidrome/.env index 766e5f1..6112ff7 100644 --- a/services/navidrome/.env +++ b/services/navidrome/.env @@ -1,3 +1,4 @@ # Dot Env for service navidrome created at Fri Apr 25 12:49:34 AM EEST 2025 NAVIDROME_DATA="/home/vm-user/local-apps/navidrome/data" -NAVIDROME_MUSIC="/home/vm-user/Media/Music" \ No newline at end of file +NAVIDROME_CONFIG="/home/vm-user/local-apps/navidrome/data/navidrome.toml" +NAVIDROME_MUSIC="/home/vm-user/Media/Music" diff --git a/services/portainer/docker-compose.yml b/services/portainer/docker-compose.yml index 89efc78..c5259d7 100644 --- a/services/portainer/docker-compose.yml +++ b/services/portainer/docker-compose.yml @@ -6,6 +6,7 @@ services: privileged: true container_name: portainer hostname: portainer + restart: unless-stopped ports: - ${SVC_PORT_1}:9443 volumes: diff --git a/services/services.yaml b/services/services.yaml index a4a6c82..ccb7fab 100644 --- a/services/services.yaml +++ b/services/services.yaml @@ -135,6 +135,20 @@ services: <<: *vm-tools-100-65 <<: *defaultServiceValues + - name: "it_tools" + ports: + - 3009 + host: + <<: *vm-tools-100-65 + <<: *defaultServiceValues + + - name: "stirling_pdf" + ports: + - 3010 + host: + <<: *vm-tools-100-65 + <<: *defaultServiceValues + # ================================ # vm-netw0rk-100-75 # ================================ diff --git a/services/stirling_pdf/.env b/services/stirling_pdf/.env new file mode 100644 index 0000000..3700e01 --- /dev/null +++ b/services/stirling_pdf/.env @@ -0,0 +1,6 @@ +# Dot Env for service stirling_pdf created at Wed Jul 9 11:30:19 PM EEST 2025 +REMOTE_APPS='/home/vm-user/remote-apps' +#STIRLING_PDF_CONFIG_REMOTE='${REMOTE_APPS}/config' +#STIRLING_PDF_CONFIG_LOCAL='${LOCAL_APPS}/config' +#STIRLING_PDF_DATA_REMOTE='${REMOTE_APPS}/data' +STIRLING_PDF_DATA_LOCAL='/home/vm-user/local-apps/stirling-pdf/data' diff --git a/services/stirling_pdf/docker-compose.yml b/services/stirling_pdf/docker-compose.yml new file mode 100644 index 0000000..0095f0a --- /dev/null +++ b/services/stirling_pdf/docker-compose.yml @@ -0,0 +1,15 @@ +# Docker Compose for service stirling_pdf created at Wed Jul 9 11:30:19 PM EEST 2025 +services: + stirling-pdf: + image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest + ports: + - '${SVC_PORT_1}:8080' + volumes: + - '${STIRLING_PDF_DATA_LOCAL}/trainingData:/usr/share/tessdata' # Required for extra OCR languages + - '${STIRLING_PDF_DATA_LOCAL}/extraConfigs:/configs' + - '${STIRLING_PDF_DATA_LOCAL}/customFiles:/customFiles/' + - '${STIRLING_PDF_DATA_LOCAL}/logs:/logs/' + - '${STIRLING_PDF_DATA_LOCAL}/pipeline:/pipeline/' + environment: + - DISABLE_ADDITIONAL_FEATURES=false + - LANGS=en_GB \ No newline at end of file diff --git a/services/tools/cli/docker_service.py b/services/tools/cli/docker_service.py index c71c66b..c88c3f0 100755 --- a/services/tools/cli/docker_service.py +++ b/services/tools/cli/docker_service.py @@ -41,7 +41,7 @@ class DockerServiceCLI(BaseCli): '-f', '--services-file', help='Path to the services file', - default='services.yaml', + default=self.get_dedault_services_file(), type=file_arg_type ) parser.add_argument( @@ -70,6 +70,9 @@ class DockerServiceCLI(BaseCli): self.configure_args(parser) self.args = self.process_args(parser) self.services_basedir = find_git_base_dir() + f'/{SERVICES_DIR_RELATIVE_GIT_ROOT}' + + def get_dedault_services_file(self): + return find_git_base_dir() + '/services/services.yaml' def load_services(self) -> List[Service]: with open(self.args.services_file, 'r') as file: diff --git a/services/wireguard/.env b/services/wireguard/.env index abaf4fd..c466e2b 100644 --- a/services/wireguard/.env +++ b/services/wireguard/.env @@ -1,5 +1,5 @@ CONFIG_PATH="/home/vm-user/remote-apps/wireguard/etc" -WG_ALLOWED_IPS=0.0.0.0/0 +WG_ALLOWED_IPS=0.0.0.0/0, ::/0 WG_DEFAULT_ADDRESS=192.168.99.x WG_DEFAULT_DNS=192.168.100.96 WG_DEVICE=eth0 \ No newline at end of file diff --git a/services/youtube_downloaders/.env b/services/youtube_downloaders/.env index db0eef9..2b68adc 100644 --- a/services/youtube_downloaders/.env +++ b/services/youtube_downloaders/.env @@ -1,6 +1,5 @@ # Dot Env for service youtube_downloaders created at Wed Apr 23 10:18:19 PM EEST 2025 BASE="/home/vm-user" -METATUBE_DOWNLOADS="${BASE}/Media/Music" +METUBE_DOWNLOADS="${BASE}/Media/Music" METATUBE_DB="${BASE}/local-apps/youtube_downloaders/metatube/db" METATUBE_MIGRATIONS="${BASE}/local-apps/youtube_downloaders/metatube/migrations" -METUBE_DOWNLOADS="${BASE}/Media/Downloads/MeTube"