From 1d157000d0c10f8e53c09f1f9506b2f259154381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= Date: Sat, 24 Aug 2024 23:15:15 +0100 Subject: [PATCH] modified: README.md modified: services/code-server/docker-compose.yaml modified: services/code-server/docker-run.sh --- README.md | 93 +++++++++++------------- services/code-server/docker-compose.yaml | 2 +- services/code-server/docker-run.sh | 4 +- 3 files changed, 45 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index df66658..219a7d8 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,32 @@ Welcome to homesrv01.dev.lan git page. +- [homesrv01.dev.lan](#homesrv01devlan) + - [OS](#os) + - [Development / Maintenance Environment](#development--maintenance-environment) + - [setup](#setup) + - [fstab](#fstab) + - [ssh](#ssh) + - [Update](#update) + - [Services](#services) + - [External volumes](#external-volumes) + - [Portainer](#portainer) + - [Promtail](#promtail) + - [Telegraf](#telegraf) + - [Setup \& Update](#setup--update) + - [nginx](#nginx) + - [Setup \& Update](#setup--update-1) + - [code-server](#code-server) + - [Setup \& Update](#setup--update-2) + - [home assistant](#home-assistant) + - [LMS](#lms) + - [Mosquitto](#mosquitto) + - [wyoming-faster-whisper](#wyoming-faster-whisper) + - [Setup \& Update](#setup--update-3) + - [wyoming-piper](#wyoming-piper) + - [Setup \& Update](#setup--update-4) + + ## OS Currently hosted on a proxmox ubuntu container. @@ -40,10 +66,7 @@ Codename: noble ## Development / Maintenance Environment -Currently using docker code server as an editor. - -But doing this way, **it is important to remember that editing files, git commands and control is done in VS CODE on the Development machine, but the execution of commands must be done over ssh.** - +Currently using docker code server as an editor. ## setup @@ -55,16 +78,15 @@ curl -fsSL https://get.docker.com -o get-docker.sh && sh ./get-docker.sh docker run hello-world && docker info apt install sshfs apt install ansible -``` +``` ## fstab -``` +```bash #/etc/fstab #sshfs#media@nas.lan:/home/media /mnt/media@sshfs:nas.lan fuse defaults,_netdev,allow_other,follow_symlinks 0 0 ``` - ## ssh ```bash @@ -76,23 +98,14 @@ PermitRootLogin no systemctl restart ssh ``` -## Update -```bash -scripts/auto-update.sh -``` -cron +## Update + ```bash +./scripts/auto-update.sh ln -s $PWD/scripts/auto-update.sh /etc/cron.daily/auto-update -``` - -check logs - -```bash journalctl -r -t auto-update ``` - - ## Services ### External volumes @@ -105,11 +118,11 @@ docker volume create --driver local --opt type=none --opt device=/ --opt o=bind ### Portainer - mantained by ansible myInfra.docker.portainer role + maintained by ansible myInfra.docker.portainer role ### Promtail -mantained by ansible myInfra.docker.promtail role +maintained by ansible myInfra.docker.promtail role ### Telegraf @@ -120,6 +133,7 @@ mantained by ansible myInfra.docker.telegraf role ### nginx #### Setup & Update + ``` bash services/nginx/docker-run.sh ``` @@ -132,31 +146,12 @@ services/nginx/docker-run.sh services/code-server/docker-run.sh ``` - - - - ### home assistant + [Git Repo](https://git.limbosolutions.com/marcio.fernandes/homeAssistant) -[from dev machine](services/has/README.md) - - -for setup execute on portainer docker compose then mount on code server -``` -- has_config:/config/workspace/host/repos/homesrv01.dev.lan/services/has/volumes/config -``` - -on code server from repo root folder - -``` -cd services -mkdir has -cd has -git glone ssh://git@git.limbosolutions.com:2222/marcio.fernandes/homeAssistant.git . -``` - ### LMS + [Git Repo](/marcio.fernandes/lms) ### Mosquitto @@ -165,28 +160,28 @@ git glone ssh://git@git.limbosolutions.com:2222/marcio.fernandes/homeAssistant.g [from dev machine](services/mosquitto/README.md) - for setup execute on portainer docker compose then mount on code server -``` + +``` bash - mosquitto_config:/config/workspace/host/repos/homesrv01.dev.lan/services/mosquitto/volumes/config - mosquitto_data:/config/workspace/host/repos/homesrv01.dev.lan/service/mosquitto/volumes/data ``` on code server from repo root folder -``` +``` bash cd services mkdir mosquitto cd mosquitto git glone ssh://git@git.limbosolutions.com:2222/marcio.fernandes/mosquitto.git . ``` - ## wyoming-faster-whisper https://github.com/home-assistant/addons/blob/master/whisper/DOCS.md #### Setup & Update + ``` bash services/wyoming-faster-whisper/docker-run.sh ``` @@ -194,11 +189,7 @@ services/wyoming-faster-whisper/docker-run.sh ## wyoming-piper #### Setup & Update + ``` bash services/wyoming-piper/docker-run.sh ``` - - - - - diff --git a/services/code-server/docker-compose.yaml b/services/code-server/docker-compose.yaml index ffd44c0..decea91 100644 --- a/services/code-server/docker-compose.yaml +++ b/services/code-server/docker-compose.yaml @@ -13,7 +13,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock - code-server_config:/config - code-server_root:/root - - has_config:/config/workspace/host/repos/homesrv01.dev.lan/services/has/volumes/config + - has_config:/config/workspace/has/volumes/config - ./../nginx/volumes/nginx_conf:/config/workspace/host/repos/homesrv01.dev.lan/services/nginx/volumes/nginx_conf #- mosquitto_config:/config/workspace/host/repos/homesrv01.dev.lan/services/mosquitto/volumes/config #- mosquitto_data:/config/workspace/host/repos/homesrv01.dev.lan/services/mosquitto/volumes/data diff --git a/services/code-server/docker-run.sh b/services/code-server/docker-run.sh index ad8c1ba..b70adeb 100755 --- a/services/code-server/docker-run.sh +++ b/services/code-server/docker-run.sh @@ -4,8 +4,8 @@ scriptPath="$(dirname "$(readlink -f "$0")")" currentPath=$PWD cd $scriptPath -docker-compose pull -docker-compose up --force-recreate --build -d +docker compose pull +docker compose up --force-recreate --build -d cd $currentPath