From a112723532a2e2d10705d3844fe4daf1e1b78837 Mon Sep 17 00:00:00 2001 From: Actaeus Curabitur Date: Wed, 17 Aug 2022 09:38:36 -0500 Subject: [PATCH] fixed git, fixed salt dependencies, fixed jacket package name --- pillars/roles/git/portal.sls | 6 +++--- pillars/roles/git/saltmaster.sls | 4 ++-- pillars/roles/git/ytdownloader.sls | 2 +- states/basepkgs/init.sls | 1 + states/roles/maintain/jackett/init.sls | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pillars/roles/git/portal.sls b/pillars/roles/git/portal.sls index 5c9cccf..a40c249 100644 --- a/pillars/roles/git/portal.sls +++ b/pillars/roles/git/portal.sls @@ -1,6 +1,6 @@ git: tmux-root: - repo: "ssh://gogs@git.actcur.com:5022/actcur/tmux.git" + repo: "ssh://gitea@git.actcur.com:5022/actcur/tmux.git" path: "/root/tmux" branch: "master" key: "git_actcur" @@ -8,7 +8,7 @@ git: email: "actcur@actcur.com" name: "Actaeus Curabitur" tmux-ejparker: - repo: "ssh://gogs@git.actcur.com:5022/actcur/tmux.git" + repo: "ssh://gitea@git.actcur.com:5022/actcur/tmux.git" path: "/ejparker/tmux" branch: "master" key: "git_actcur" @@ -16,7 +16,7 @@ git: email: "actcur@actcur.com" name: "Actaeus Curabitur" web: - repo: "ssh://gogs@git.actcur.com:5022/actcur/portal.git" + repo: "ssh://gitea@git.actcur.com:5022/actcur/portal.git" path: "/srv/http/portal" branch: "master" key: "git_actcur" diff --git a/pillars/roles/git/saltmaster.sls b/pillars/roles/git/saltmaster.sls index 5641da5..05d6f71 100644 --- a/pillars/roles/git/saltmaster.sls +++ b/pillars/roles/git/saltmaster.sls @@ -1,6 +1,6 @@ git: salt: - repo: "ssh://gogs@git.actcur.com:5022/actcur/salt.git" + repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git" path: "/srv/salt/prod" branch: "master" key: "git_actcur" @@ -8,7 +8,7 @@ git: email: "actcur@actcur.com" name: "Actaeus Curabitur" salt_dev: - repo: "ssh://gogs@git.actcur.com:5022/actcur/salt.git" + repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git" path: "/srv/salt/dev" branch: "dev" key: "git_actcur" diff --git a/pillars/roles/git/ytdownloader.sls b/pillars/roles/git/ytdownloader.sls index 2f2f60b..ed666f9 100644 --- a/pillars/roles/git/ytdownloader.sls +++ b/pillars/roles/git/ytdownloader.sls @@ -1,6 +1,6 @@ git: ytdownloader: - repo: "ssh://gogs@git.actcur.com:5022/actcur/ytdownloader.git" + repo: "ssh://gitea@git.actcur.com:5022/actcur/ytdownloader.git" path: "/root/scripts/ytdownloader" branch: "master" key: "git_actcur" diff --git a/states/basepkgs/init.sls b/states/basepkgs/init.sls index 3f895ed..a40865c 100644 --- a/states/basepkgs/init.sls +++ b/states/basepkgs/init.sls @@ -9,6 +9,7 @@ basepkgs: - htop - git - net-tools + - python-psutil {% elif grains['os_family'] == 'Debian' %} basepkgs: pkg.installed: diff --git a/states/roles/maintain/jackett/init.sls b/states/roles/maintain/jackett/init.sls index dcb7ef7..15e308b 100644 --- a/states/roles/maintain/jackett/init.sls +++ b/states/roles/maintain/jackett/init.sls @@ -5,7 +5,7 @@ - mkdirs: true #package is in aur repo -jackett: +jackett-bin: pkg.installed jackett_service: