From 0221928719585c793beeac9a8f64c2d9db4817f9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Dec 2020 21:32:24 +0200 Subject: [PATCH 01/38] Add index.korhonen.cc and aur repository --- docker/index.korhonen.cc/docker-compose.yaml | 33 ++++++++++++++++++++ docker/marko.korhonen.cc/docker-compose.yaml | 30 ------------------ root/etc/pacman.conf | 9 ++++++ 3 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 docker/index.korhonen.cc/docker-compose.yaml delete mode 100644 docker/marko.korhonen.cc/docker-compose.yaml diff --git a/docker/index.korhonen.cc/docker-compose.yaml b/docker/index.korhonen.cc/docker-compose.yaml new file mode 100644 index 00000000..16ded23e --- /dev/null +++ b/docker/index.korhonen.cc/docker-compose.yaml @@ -0,0 +1,33 @@ +version: "3" + +services: + nginx: + image: fraoustin/fancyindex + container_name: index.korhonen.cc + environment: + - DISABLE_AUTH=true + - CONTAINER_TIMEZONE="Europe/Helsinki" + volumes: + - /docker/index.korhonen.cc:/share + networks: + - proxy + restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.index-redirect.entrypoints=http" + - "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.index-redirect.middlewares=http2https" + + - "traefik.http.routers.index.entrypoints=https" + - "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)" + - "traefik.http.routers.index.tls=true" + - "traefik.http.routers.index.tls.certresolver=http" + - "traefik.http.routers.index.service=index" + - "traefik.docker.network=proxy" + - "traefik.http.services.index.loadbalancer.server.port=80" + +networks: + proxy: + external: true diff --git a/docker/marko.korhonen.cc/docker-compose.yaml b/docker/marko.korhonen.cc/docker-compose.yaml deleted file mode 100644 index 522dbc17..00000000 --- a/docker/marko.korhonen.cc/docker-compose.yaml +++ /dev/null @@ -1,30 +0,0 @@ -version: "3" - -services: - site: - image: nginx:alpine - container_name: marko.korhonen.cc - volumes: - - /docker/marko.korhonen.cc:/usr/share/nginx/html:ro - networks: - - proxy - restart: unless-stopped - labels: - - "traefik.enable=true" - - - "traefik.http.routers.marko-redirect.entrypoints=http" - - "traefik.http.routers.marko-redirect.rule=Host(`marko.korhonen.cc`)" - - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" - - "traefik.http.routers.marko-redirect.middlewares=http2https" - - - "traefik.http.routers.marko.entrypoints=https" - - "traefik.http.routers.marko.rule=Host(`marko.korhonen.cc`)" - - "traefik.http.routers.marko.tls=true" - - "traefik.http.routers.marko.tls.certresolver=http" - - "traefik.http.routers.marko.service=marko" - - "traefik.docker.network=proxy" - - "traefik.http.services.marko.loadbalancer.server.port=80" - -networks: - proxy: - external: true diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 43ca4cc3..42a140e9 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -9,6 +9,15 @@ Architecture = auto LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg +[korhonen-aur] +{%@@ if profile == "Moria" @@%} +Server = file:///docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +CleanMethod=KeepCurrent +CacheDir=/docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +{%@@ else @@%} +Server = https://index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +{%@@ endif @@%} + [core] Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/mirrorlist From dca64d7a4c87e79fab65efcdef3cd2cbba7c3558 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Dec 2020 00:03:06 +0200 Subject: [PATCH 02/38] Fix gpg env setup --- home/.config/zsh/01-env.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 8e509d7e..5289a9ac 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -36,8 +36,8 @@ export PAGER="nvimpager -p" # use gpg for ssh export GPG_TTY="$(tty)" -export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" -gpg-connect-agent updatestartuptty /bye > /dev/null +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +gpgconf --launch gpg-agent # tehfuk eval $(thefuck --alias) From ef78840837319383e1e648176ee58f34843f30bf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Dec 2020 00:08:23 +0200 Subject: [PATCH 03/38] Only set SSH_AUTH_SOCK if not logging in over SSH --- home/.config/zsh/01-env.zsh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 5289a9ac..d2899fa0 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -34,10 +34,14 @@ export DOTREPO="$HOME/git/dotfiles" export EDITOR=nvim export PAGER="nvimpager -p" -# use gpg for ssh +# Use GPG for SSH authentication export GPG_TTY="$(tty)" -export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -gpgconf --launch gpg-agent + +# set SSH_AUTH_SOCK if not logging in over SSH +if [ "$SSH_CONNECTION" != "" ]; then + export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + gpgconf --launch gpg-agent +fi # tehfuk eval $(thefuck --alias) From ff1dc5b6b08b126de47484ee50bb5ff94f6bb71a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 20 Dec 2020 12:05:48 +0200 Subject: [PATCH 04/38] Move aur repo path --- root/etc/pacman.conf | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 42a140e9..ce1d41be 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -8,14 +8,16 @@ SigLevel = Required DatabaseOptional Architecture = auto LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg - -[korhonen-aur] {%@@ if profile == "Moria" @@%} -Server = file:///docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur CleanMethod=KeepCurrent -CacheDir=/docker/index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/$arch +{%@@ endif @@%} + +[korhonen_aur] +{%@@ if profile == "Moria" @@%} +Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} -Server = https://index.korhonen.cc/repo/os/linux/arch/x86_64/korhonen-aur +Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} [core] From 9302f193eefc2cbffe7629a42120e256547d7e87 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 20 Dec 2020 15:34:07 +0200 Subject: [PATCH 05/38] Add repo maintenance alias and AUR_PAGER in env --- home/.config/zsh/01-env.zsh | 1 + home/.config/zsh/03-aliases.zsh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index d2899fa0..e742dd41 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -33,6 +33,7 @@ export DOTREPO="$HOME/git/dotfiles" # nvim ftw! export EDITOR=nvim export PAGER="nvimpager -p" +export AUR_PAGER=$PAGER # Use GPG for SSH authentication export GPG_TTY="$(tty)" diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7f0afa24..cd4d4d89 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -204,6 +204,9 @@ alias notify-send='notify-send --icon=alarm' # download archiso alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' +# Update repository +alias repoupdate='aur sync -Su --margs --noconfirm' + # encrypted tar's with zstd compression cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } @@ -280,4 +283,3 @@ btw, () { ▟███▀▘ ▝▀███▙ ▟▛▀ ▀▜▙" } - From 27cba9af96009ca0d6a3fb305e2fa910dd3993a5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 10:59:03 +0200 Subject: [PATCH 06/38] Small fixes --- home/.config/zsh/03-aliases.zsh | 17 +++++------------ home/.ssh/config | 2 -- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index cd4d4d89..b874255e 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -130,21 +130,18 @@ update() { all() { plugins {%@@ if profile == "Moria" @@%} - base --devel + repo docker-update docker system prune --volumes - {%@@ elif profile == "Mirkwood" @@%} - base --devel firefox-nightly {%@@ else @@%} - base --devel + paru {%@@ endif @@%} flatpak update sudo awman-update } - base() { - paru -Pw - paru -Syu $@ + repo() { + aur sync -Su --margs --noconfirm } plugins() { @@ -171,9 +168,6 @@ update() { all) all ;; - base) - base - ;; plugins) plugins ;; @@ -181,7 +175,7 @@ update() { docker-update ;; *) - base $@ + paru ;; esac } @@ -205,7 +199,6 @@ alias notify-send='notify-send --icon=alarm' alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' # Update repository -alias repoupdate='aur sync -Su --margs --noconfirm' # encrypted tar's with zstd compression diff --git a/home/.ssh/config b/home/.ssh/config index b99bf18d..f58a5d37 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -28,13 +28,11 @@ host gondor hostname gondor.korhonen.cc port 22 User reekymarko - ForwardAgent yes host anitta HostName 10.200.200.4 port 22 user reekymarko - ForwardAgent yes host takamaki HostName 10.200.200.5 From c5a9bb6c6a7552a20227a4653808fff7636e494c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:05:49 +0200 Subject: [PATCH 07/38] Update firefox nightly every time repo updates --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index b874255e..a8236fda 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -141,7 +141,7 @@ update() { } repo() { - aur sync -Su --margs --noconfirm + aur sync -Su --margs --noconfirm firefox-nightly } plugins() { From 4e3582c3a764423b3544f4c235f952ac6d073cbf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:11:53 +0200 Subject: [PATCH 08/38] Small fix --- home/.config/zsh/03-aliases.zsh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index a8236fda..10371bbe 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -128,15 +128,14 @@ passync() { pass git pull && pass git push && updatesecrets } update() { all() { + paru plugins {%@@ if profile == "Moria" @@%} repo docker-update docker system prune --volumes - {%@@ else @@%} - paru {%@@ endif @@%} - flatpak update + sudo flatpak update sudo awman-update } @@ -174,6 +173,9 @@ update() { docker) docker-update ;; + repo) + repo + ;; *) paru ;; From 7eec915e2fcd5aee3e564b95e405721480c8aea6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:46:44 +0200 Subject: [PATCH 09/38] Add Edoras and use pacserve for korhonen_aur --- config-root.yaml | 3 +++ root/etc/pacman.conf | 1 + 2 files changed, 4 insertions(+) diff --git a/config-root.yaml b/config-root.yaml index 3346e1dd..35c32064 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -167,3 +167,6 @@ profiles: localhost: include: - Locale + Edoras: + include: + - Pacman diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index ce1d41be..fb164ac2 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -17,6 +17,7 @@ CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/$arch {%@@ if profile == "Moria" @@%} Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} +Include = /etc/pacman.d/pacserve Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} From e5eb57ec22b6feea7d9fe9e85bbd526f8719e654 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:49:03 +0200 Subject: [PATCH 10/38] AnittaPC -> Edoras --- config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index 22ea54df..09c49dec 100644 --- a/config.yaml +++ b/config.yaml @@ -258,7 +258,7 @@ profiles: - f_init.vim - f_coc-settings.json - f_alacritty.yml - AnittaPC: + Edoras: include: - terminal - Pacman From 185ecacb485b96451a5f169281dc76ce1a755547 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 14:39:12 +0200 Subject: [PATCH 11/38] Add ubooquity --- docker/ubooquity/docker-compose.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 docker/ubooquity/docker-compose.yaml diff --git a/docker/ubooquity/docker-compose.yaml b/docker/ubooquity/docker-compose.yaml new file mode 100644 index 00000000..10a0fd8d --- /dev/null +++ b/docker/ubooquity/docker-compose.yaml @@ -0,0 +1,19 @@ +version: "2.1" +services: + ubooquity: + image: ghcr.io/linuxserver/ubooquity + container_name: ubooquity + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Helsinki + - MAXMEM=1024 + volumes: + - /docker/ubooquity/config:/config + - /docker/ubooquity/books:/books + - /docker/ubooquity/comics:/comics + - /docker/ubooquity/files:/files + ports: + - 2202:2202 + - 2203:2203 + restart: unless-stopped From cde63a58810a37e4bf8f19c60bcdf193a779216d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 30 Dec 2020 10:58:25 +0200 Subject: [PATCH 12/38] Add pacman config for gondor --- config-root.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config-root.yaml b/config-root.yaml index 35c32064..714389bd 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -162,6 +162,7 @@ profiles: Gondor: include: - Locale + - Pacman dotfiles: - f_sshd_config localhost: From 5bcce6a3d4b54675d8852366b5e73e4ca6b6630e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 13:47:13 +0200 Subject: [PATCH 13/38] Add remote forward --- home/.ssh/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.ssh/config b/home/.ssh/config index f58a5d37..a00f477a 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -23,11 +23,13 @@ host moria port 221 User balrog ForwardAgent yes + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host gondor hostname gondor.korhonen.cc port 22 User reekymarko + RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra host anitta HostName 10.200.200.4 From 6e8d0a9dfe47376fc17a649736b8b391f8cecc6c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 13:51:59 +0200 Subject: [PATCH 14/38] Update dotdrop, remove ubooquity --- docker/ubooquity/docker-compose.yaml | 19 ------------------- dotdrop | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 docker/ubooquity/docker-compose.yaml diff --git a/docker/ubooquity/docker-compose.yaml b/docker/ubooquity/docker-compose.yaml deleted file mode 100644 index 10a0fd8d..00000000 --- a/docker/ubooquity/docker-compose.yaml +++ /dev/null @@ -1,19 +0,0 @@ -version: "2.1" -services: - ubooquity: - image: ghcr.io/linuxserver/ubooquity - container_name: ubooquity - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Helsinki - - MAXMEM=1024 - volumes: - - /docker/ubooquity/config:/config - - /docker/ubooquity/books:/books - - /docker/ubooquity/comics:/comics - - /docker/ubooquity/files:/files - ports: - - 2202:2202 - - 2203:2203 - restart: unless-stopped diff --git a/dotdrop b/dotdrop index 636c1ade..39d52a2c 160000 --- a/dotdrop +++ b/dotdrop @@ -1 +1 @@ -Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7 +Subproject commit 39d52a2c8042d250f0258b1135d7d94e37a14e8f From 3c75efbe780cc9f5370f761860ee19de9c2db2a2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 14:03:30 +0200 Subject: [PATCH 15/38] Fix cachedir on repo --- root/etc/pacman.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index fb164ac2..01d8a2a7 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -10,7 +10,7 @@ LocalFileSigLevel = Optional CacheDir = /var/cache/pacman/pkg {%@@ if profile == "Moria" @@%} CleanMethod=KeepCurrent -CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/$arch +CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 {%@@ endif @@%} [korhonen_aur] From 4ecb679d367cf886cd11717ea67b3e7439abeb54 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 3 Jan 2021 21:34:03 +0200 Subject: [PATCH 16/38] Add tvheadend --- docker/tvheadend/docker-compose.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docker/tvheadend/docker-compose.yaml diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml new file mode 100644 index 00000000..e72db84a --- /dev/null +++ b/docker/tvheadend/docker-compose.yaml @@ -0,0 +1,20 @@ +version: "2" +services: + tvheadend: + image: linuxserver/tvheadend + container_name: tvheadend + environment: + - TZ=Europe/Helsinki + - PUID=1000 + - PGID=985 + volumes: + - /docker/tvheadend:/config + - /mnt/Storage/Media/PVR:/recordings + - /etc/localtime:/etc/localtime:ro + ports: + - 9981:9981 + - 9982:9982 + devices: + - /dev/dri:/dev/dri #hardware acceleration + - /dev/dvb:/dev/dvb #tuner card + restart: unless-stopped From d5cc21a24de3d45d7d000bf2189207f1edaab7b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Jan 2021 22:10:35 +0200 Subject: [PATCH 17/38] Add tvh to traefik --- docker/tvheadend/docker-compose.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index e72db84a..1667bbdc 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -12,9 +12,23 @@ services: - /mnt/Storage/Media/PVR:/recordings - /etc/localtime:/etc/localtime:ro ports: - - 9981:9981 - 9982:9982 devices: - /dev/dri:/dev/dri #hardware acceleration - /dev/dvb:/dev/dvb #tuner card restart: unless-stopped + labels: + - "traefik.enable=true" + + - "traefik.http.routers.tvheadend-redirect.entrypoints=http" + - "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.tvheadend-redirect.middlewares=http2https" + + - "traefik.http.routers.tvheadend.entrypoints=https" + - "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)" + - "traefik.http.routers.tvheadend.tls=true" + - "traefik.http.routers.tvheadend.tls.certresolver=http" + - "traefik.http.routers.tvheadend.service=tvheadend" + - "traefik.docker.network=proxy" + - "traefik.http.services.tvheadend.loadbalancer.server.port=9981" From b474cc263030bea811fa1ede23bc431eef2b97cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Jan 2021 22:14:56 +0200 Subject: [PATCH 18/38] Add proxy network for tvh --- docker/tvheadend/docker-compose.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 1667bbdc..583667f1 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -17,6 +17,8 @@ services: - /dev/dri:/dev/dri #hardware acceleration - /dev/dvb:/dev/dvb #tuner card restart: unless-stopped + networks: + - proxy labels: - "traefik.enable=true" @@ -32,3 +34,7 @@ services: - "traefik.http.routers.tvheadend.service=tvheadend" - "traefik.docker.network=proxy" - "traefik.http.services.tvheadend.loadbalancer.server.port=9981" + +networks: + proxy: + external: true From 40d525e9cb638f76a894a66c33baeab7958c765d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 11:47:08 +0200 Subject: [PATCH 19/38] Add postgresql --- docker/postgres/docker-compose.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 docker/postgres/docker-compose.yaml diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml new file mode 100644 index 00000000..92942046 --- /dev/null +++ b/docker/postgres/docker-compose.yaml @@ -0,0 +1,20 @@ +version: "3" +services: + postgres: + container_name: postgres + image: postgres:13 + environment: + - TZ=Europe/Helsinki + - POSTGRES_PASSWORD=12345 + ports: + - 5432:5432 + networks: + - postgres + volumes: + - /docker/postgres:/var/lib/postgresql/data + - /etc/localtime:/etc/localtime:ro + restart: unless-stopped + +networks: + postgres: + external: true From ad0a1aaed7aa07d82ca40510e7648285fa094988 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 11:47:26 +0200 Subject: [PATCH 20/38] Move nextcloud to postgresql --- docker/nextcloud/docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/nextcloud/docker-compose.yml b/docker/nextcloud/docker-compose.yml index e424267e..50275831 100644 --- a/docker/nextcloud/docker-compose.yml +++ b/docker/nextcloud/docker-compose.yml @@ -9,7 +9,7 @@ services: - "1869:80" networks: - nextcloud - - mariadb + - postgres - proxy volumes: - /docker/nextcloud:/var/www/html @@ -19,7 +19,6 @@ services: - /etc/localtime:/etc/localtime:ro environment: - TZ=Europe/Helsinki - - MYSQL_HOST=mariadb-nextcloud - REDIS_HOST=redis - REDIS_HOST_PASSWORD=123 depends_on: @@ -61,7 +60,7 @@ services: networks: nextcloud: external: false - mariadb: + postgres: external: true proxy: external: true From 83bfedf9cc83ae052700f440cbe9ee911648c225 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 12:14:05 +0200 Subject: [PATCH 21/38] Change freshrss to postgresql --- docker/freshrss/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index aaf1286e..5c2ec94f 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -6,7 +6,7 @@ services: restart: unless-stopped networks: - freshrss - - mariadb + - postgres - proxy ports: - 8088:80 @@ -36,7 +36,7 @@ services: networks: freshrss: external: false - mariadb: + postgres: external: true proxy: external: true From 2e2bfe468fa879e63d7af9dd2e584a368a3fccc1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 13:40:57 +0200 Subject: [PATCH 22/38] Move gitea to postgresql --- docker/gitea/docker-compose.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml index 4fafc49e..b633d3e7 100644 --- a/docker/gitea/docker-compose.yaml +++ b/docker/gitea/docker-compose.yaml @@ -8,14 +8,9 @@ services: - TZ=Europe/Helsinki - USER_UID=1000 - USER_GID=1000 - - DB_TYPE=mysql - - DB_HOST=mariadb:3306 - - DB_NAME=gitea - - DB_USER=gitea - - DB_PASSWD=${MYSQL_PASS} restart: unless-stopped networks: - - mariadb + - postgres - proxy ports: - "3000:3000" @@ -40,7 +35,7 @@ services: - "traefik.http.services.gitea.loadbalancer.server.port=3000" networks: - mariadb: + postgres: external: true proxy: external: true From d923eb66281b848a286f5266efb92bc427689a8d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 13:41:25 +0200 Subject: [PATCH 23/38] Move homeautomation for postgresql --- docker/homeautomation/docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml index d339b160..ebcf1206 100644 --- a/docker/homeautomation/docker-compose.yml +++ b/docker/homeautomation/docker-compose.yml @@ -13,7 +13,7 @@ services: restart: unless-stopped networks: - homeautomation - - mariadb + - postgres - proxy ports: - "8123:8123" @@ -133,11 +133,11 @@ services: volumes: - /docker/homeautomation/gotify:/app/data environment: - - GOTIFY_DATABASE_DIALECT=mysql - - GOTIFY_DATABASE_CONNECTION=gotify:gotify@tcp(mariadb:3306)/gotify?charset=utf8&parseTime=True&loc=Local + - GOTIFY_DATABASE_DIALECT=postgres + - GOTIFY_DATABASE_CONNECTION="host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable" networks: - proxy - - mariadb + - postgres restart: unless-stopped labels: - "traefik.enable=true" @@ -158,7 +158,7 @@ services: networks: homeautomation: external: false - mariadb: + postgres: external: true proxy: external: true From 0abe29c934b3fd13646327a4cf5d2e0d0478571d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:07:38 +0200 Subject: [PATCH 24/38] Fix firefox nightly update function --- home/.config/zsh/03-aliases.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 10371bbe..1a483f00 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,7 +140,11 @@ update() { } repo() { - aur sync -Su --margs --noconfirm firefox-nightly + aur sync -Su --margs --noconfirm + } + + firefox() { + aur sync -S --rebuild --margs --noconfirm firefox-nightly } plugins() { From 3e426415d7add975914e939e7a283becda432e9b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:07:38 +0200 Subject: [PATCH 25/38] Fix firefox nightly update function --- home/.config/zsh/03-aliases.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 10371bbe..1a483f00 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,7 +140,11 @@ update() { } repo() { - aur sync -Su --margs --noconfirm firefox-nightly + aur sync -Su --margs --noconfirm + } + + firefox() { + aur sync -S --rebuild --margs --noconfirm firefox-nightly } plugins() { From 9a7b5d44242746d37945c8322d53282efd5f6666 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:10:24 +0200 Subject: [PATCH 26/38] Fix firefox update function --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 1a483f00..95ba75de 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -144,7 +144,7 @@ update() { } firefox() { - aur sync -S --rebuild --margs --noconfirm firefox-nightly + aur sync -S --rebuild firefox-nightly --margs --noconfirm } plugins() { From 7716782a068b6ccbc7edb29eace39b4ccd2ba1c5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:13:33 +0200 Subject: [PATCH 27/38] Fix firefox update function --- home/.config/zsh/03-aliases.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 95ba75de..7268096d 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -180,6 +180,9 @@ update() { repo) repo ;; + firefox) + firefox + ;; *) paru ;; From c91ac872406d20507dc19831575418d18c3fb45d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:14:40 +0200 Subject: [PATCH 28/38] Update firefox with all target --- home/.config/zsh/03-aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 7268096d..35fbdae1 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -132,6 +132,7 @@ update() { plugins {%@@ if profile == "Moria" @@%} repo + firefox docker-update docker system prune --volumes {%@@ endif @@%} From 00960312cdd820f10c01dc146c9a855a2c4ad638 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:24:45 +0200 Subject: [PATCH 29/38] Add spotifeed --- docker/freshrss/.gitignore | 1 + docker/freshrss/docker-compose.yml | 7 +++++++ docker/freshrss/spotifeed/Dockerfile | 10 ++++++++++ 3 files changed, 18 insertions(+) create mode 100644 docker/freshrss/.gitignore create mode 100644 docker/freshrss/spotifeed/Dockerfile diff --git a/docker/freshrss/.gitignore b/docker/freshrss/.gitignore new file mode 100644 index 00000000..4c49bd78 --- /dev/null +++ b/docker/freshrss/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 5c2ec94f..d2d9ef1b 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -33,6 +33,13 @@ services: - "traefik.docker.network=proxy" - "traefik.http.services.freshrss.loadbalancer.server.port=80" + spotifeed: + build: ./spotifeed + container_name: spotifeed + restart: unless-stopped + networks: + - freshrss + networks: freshrss: external: false diff --git a/docker/freshrss/spotifeed/Dockerfile b/docker/freshrss/spotifeed/Dockerfile new file mode 100644 index 00000000..89e030e0 --- /dev/null +++ b/docker/freshrss/spotifeed/Dockerfile @@ -0,0 +1,10 @@ +FROM ruby:2.7.2 +RUN git clone https://github.com/timdorr/spotifeed +WORKDIR /spotifeed +RUN git checkout a105f0956b33444c71a47a1cddff44f12b77c297 +RUN bundle install +EXPOSE 8083 +RUN apt-get update +RUN apt-get upgrade +RUN apt-get install redis-server -y +CMD puma -p 8083 & redis-server From dd7aae73058483ff99704a89dd6109678826961f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:26:46 +0200 Subject: [PATCH 30/38] Make freshrss depend on spotifeed --- docker/freshrss/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index d2d9ef1b..08aba513 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -14,6 +14,8 @@ services: - PUID=1000 - PGID=985 - TZ=Europe/Helsinki + depends_on: + - spotifeed volumes: - /docker/freshrss:/config - /etc/localtime:/etc/localtime:ro From a4c57aaf28944a56b3e63834a898dd44e95246ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:30:24 +0200 Subject: [PATCH 31/38] Use master version of spotifeed --- docker/freshrss/spotifeed/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/freshrss/spotifeed/Dockerfile b/docker/freshrss/spotifeed/Dockerfile index 89e030e0..63c1604d 100644 --- a/docker/freshrss/spotifeed/Dockerfile +++ b/docker/freshrss/spotifeed/Dockerfile @@ -1,7 +1,6 @@ FROM ruby:2.7.2 RUN git clone https://github.com/timdorr/spotifeed WORKDIR /spotifeed -RUN git checkout a105f0956b33444c71a47a1cddff44f12b77c297 RUN bundle install EXPOSE 8083 RUN apt-get update From 7877253492cf380c53c6041b7376797aedb48dea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:32:34 +0200 Subject: [PATCH 32/38] Add image name for spotifeed and open ports --- docker/freshrss/docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 08aba513..22d7c08e 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -37,6 +37,9 @@ services: spotifeed: build: ./spotifeed + image: spotifeed + ports: + - "8083:8083" container_name: spotifeed restart: unless-stopped networks: From a842174eddc9f7db7e3b7b961713863fee51919d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:46:00 +0200 Subject: [PATCH 33/38] Add bibliogram --- docker/freshrss/docker-compose.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 22d7c08e..d6c1fc3c 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -17,7 +17,7 @@ services: depends_on: - spotifeed volumes: - - /docker/freshrss:/config + - /docker/freshrss/freshrss:/config - /etc/localtime:/etc/localtime:ro labels: - "traefik.enable=true" @@ -38,13 +38,24 @@ services: spotifeed: build: ./spotifeed image: spotifeed - ports: - - "8083:8083" container_name: spotifeed + ports: + - 8083:8083 restart: unless-stopped networks: - freshrss + bibliogram: + image: cloudrac3r/bibliogram + container_name: bibliogram + restart: unless-stopped + volumes: + - /docker/freshrss/bibliogram/db:/app/db + networks: + - freshrss + ports: + - 10407:10407 + networks: freshrss: external: false From 650f51c67499f006688d00a002c635b03aaa5a56 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:50:35 +0200 Subject: [PATCH 34/38] Publish bibliogram on the proxy --- docker/freshrss/docker-compose.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index d6c1fc3c..8a9c0b4d 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -53,8 +53,22 @@ services: - /docker/freshrss/bibliogram/db:/app/db networks: - freshrss - ports: - - 10407:10407 + - proxy + labels: + - "traefik.enable=true" + + - "traefik.http.routers.bibliogram-redirect.entrypoints=http" + - "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)" + - "traefik.http.middlewares.http2https.redirectscheme.scheme=https" + - "traefik.http.routers.bibliogram-redirect.middlewares=http2https" + + - "traefik.http.routers.bibliogram.entrypoints=https" + - "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)" + - "traefik.http.routers.bibliogram.tls=true" + - "traefik.http.routers.bibliogram.tls.certresolver=http" + - "traefik.http.routers.bibliogram.service=bibliogram" + - "traefik.docker.network=proxy" + - "traefik.http.services.bibliogram.loadbalancer.server.port=10407" networks: freshrss: From b9179776edf2e0e1014438cea1f84ecbe6f00f50 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:58:54 +0200 Subject: [PATCH 35/38] Mount bibliogram config --- docker/freshrss/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml index 8a9c0b4d..7498ace6 100644 --- a/docker/freshrss/docker-compose.yml +++ b/docker/freshrss/docker-compose.yml @@ -51,6 +51,7 @@ services: restart: unless-stopped volumes: - /docker/freshrss/bibliogram/db:/app/db + - /docker/freshrss/bibliogram/config.js:/app/config.js networks: - freshrss - proxy From ef4de49e7ceb18315b1717054b8f089dc96336a8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Jan 2021 18:40:44 +0200 Subject: [PATCH 36/38] Make update repo function update firefox too --- home/.config/zsh/03-aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 35fbdae1..4c0d4215 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -132,7 +132,6 @@ update() { plugins {%@@ if profile == "Moria" @@%} repo - firefox docker-update docker system prune --volumes {%@@ endif @@%} @@ -142,6 +141,7 @@ update() { repo() { aur sync -Su --margs --noconfirm + firefox } firefox() { From c03e48d67a1b49ef23087747c5c0b754ba1d5a16 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:22:45 +0200 Subject: [PATCH 37/38] Remove deprecated ncmpcpp options --- home/.config/ncmpcpp/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home/.config/ncmpcpp/config b/home/.config/ncmpcpp/config index c6b5ccd9..ebe09fb9 100644 --- a/home/.config/ncmpcpp/config +++ b/home/.config/ncmpcpp/config @@ -9,10 +9,9 @@ mpd_music_dir = ~/Music mpd_crossfade_time = 2 ##### visualizer ##### -visualizer_fifo_path = /tmp/mpd.fifo +visualizer_data_source = /tmp/mpd.fifo visualizer_output_name = Visualizer visualizer_in_stereo = yes -visualizer_sync_interval = 30 # spectrum,wave,wave_filled,ellipse. visualizer_type = wave_filled visualizer_look = ●▮ From fd919de060125f986056bd048ab870b6fb660831 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:23:00 +0200 Subject: [PATCH 38/38] Add coc-flutter to nvim --- home/.config/nvim/conf.d/01-plugins.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim index 690629e2..6c18ec60 100644 --- a/home/.config/nvim/conf.d/01-plugins.vim +++ b/home/.config/nvim/conf.d/01-plugins.vim @@ -18,7 +18,8 @@ let g:coc_global_extensions = [ \ 'coc-rust-analyzer', \ 'coc-markdownlint', \ 'coc-snippets', - \ 'coc-java' + \ 'coc-java', + \ 'coc-flutter' \ ] call plug#begin()