From bb01d48f7d2cb7f5a66f676d4a1ec4083976b4ee Mon Sep 17 00:00:00 2001 From: Actaeus Curabitur Date: Wed, 17 Aug 2022 10:16:41 -0500 Subject: [PATCH] fixed gitea repo names --- pillars/roles/aurpkgs/git.sls | 2 +- pillars/roles/backup/{gogs.sls => gitea.sls} | 4 ++-- pillars/roles/database/{gogs.sls => gitea.sls} | 6 +++--- pillars/roles/gitea/portal.sls | 6 +++--- pillars/roles/gitea/saltmaster.sls | 4 ++-- pillars/roles/gitea/ytdownloader.sls | 2 +- pillars/roles/router/misc.sls | 2 +- pillars/roles/services/git.sls | 3 --- 8 files changed, 13 insertions(+), 16 deletions(-) rename pillars/roles/backup/{gogs.sls => gitea.sls} (78%) rename pillars/roles/database/{gogs.sls => gitea.sls} (77%) delete mode 100644 pillars/roles/services/git.sls diff --git a/pillars/roles/aurpkgs/git.sls b/pillars/roles/aurpkgs/git.sls index 4b803c3..e7b215d 100644 --- a/pillars/roles/aurpkgs/git.sls +++ b/pillars/roles/aurpkgs/git.sls @@ -1,3 +1,3 @@ aur: pkgs: - gogs: [] + gitea: [] diff --git a/pillars/roles/backup/gogs.sls b/pillars/roles/backup/gitea.sls similarity index 78% rename from pillars/roles/backup/gogs.sls rename to pillars/roles/backup/gitea.sls index 806cc29..2e5dbd3 100644 --- a/pillars/roles/backup/gogs.sls +++ b/pillars/roles/backup/gitea.sls @@ -1,6 +1,6 @@ backup: - gogs: - location: /var/lib/gogs/ + gitea: + location: /var/lib/gitea/ rsync_user: backups key: backups_key host: host.actcur.com diff --git a/pillars/roles/database/gogs.sls b/pillars/roles/database/gitea.sls similarity index 77% rename from pillars/roles/database/gogs.sls rename to pillars/roles/database/gitea.sls index 4be0aab..d5dbe19 100644 --- a/pillars/roles/database/gogs.sls +++ b/pillars/roles/database/gitea.sls @@ -1,9 +1,9 @@ database: users: - gogs: + gitea: host: git.actcur.com databases: - gogs: - gogs: + gitea: + gitea: host: git.actcur.com grant: all privileges diff --git a/pillars/roles/gitea/portal.sls b/pillars/roles/gitea/portal.sls index 5c9cccf..a40c249 100644 --- a/pillars/roles/gitea/portal.sls +++ b/pillars/roles/gitea/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/gitea/saltmaster.sls b/pillars/roles/gitea/saltmaster.sls index 5641da5..05d6f71 100644 --- a/pillars/roles/gitea/saltmaster.sls +++ b/pillars/roles/gitea/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/gitea/ytdownloader.sls b/pillars/roles/gitea/ytdownloader.sls index 2f2f60b..ed666f9 100644 --- a/pillars/roles/gitea/ytdownloader.sls +++ b/pillars/roles/gitea/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/pillars/roles/router/misc.sls b/pillars/roles/router/misc.sls index 1630b8a..e3352df 100644 --- a/pillars/roles/router/misc.sls +++ b/pillars/roles/router/misc.sls @@ -117,7 +117,7 @@ router: mac: 52:54:00:7e:cc:99 ip: 172.16.41.68 ports: - gogs-ssh: 5022.5022 + gitea-ssh: 5022.5022 baikal: mac: 52:54:00:0f:81:f8 ip: 172.16.41.69 diff --git a/pillars/roles/services/git.sls b/pillars/roles/services/git.sls deleted file mode 100644 index abfb353..0000000 --- a/pillars/roles/services/git.sls +++ /dev/null @@ -1,3 +0,0 @@ -services: - git: - gogs: []