actcur/salt
3
0
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/qual' into dev

Browse source
This commit is contained in:
Actaeus Curabitur 2022-09-22 11:08:08 -05:00
commit 9f8e3eb0a8
20 changed files with 115 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pillars/roles.jinja Normal file
View file

@ -0,0 +1 @@
{%- set roles=salt.cmd.shell("grep -Po '(?<=- ).*' /srv/salt/"+saltenv+"/pillars/servers/roles/server/"+grains['host']+".sls").split('\n') -%}

27
pillars/roles/aurpkgs/init.sls
View file

@ -1,21 +1,20 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.aurpkgs.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- if 'aurrepo' in grains['roles'] -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.aurpkgs.") -%}
{%- set role = state.split('.')[3] %}
{%- if roles is not none -%}
{%- if 'aurrepo' in roles -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.aurpkgs.") -%}
{%- set role = state.split('.')[3] %}
- roles.aurpkgs.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- else -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.aurpkgs.'+role in states %}
{%- endif -%}
{%- endfor -%}
{%- else -%}
{%- for role in roles %}
{%- if 'pillars.roles.aurpkgs.'+role in states %}
- roles.aurpkgs.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}

27
pillars/roles/backup/init.sls
View file

@ -1,21 +1,20 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.backup.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- if 'backup' in grains['roles'] -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.backup.") -%}
{%- set role = state.split('.')[3] %}
{%- if roles is not none -%}
{%- if 'backup' in roles -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.backup.") -%}
{%- set role = state.split('.')[3] %}
- roles.backup.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- else -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.backup.'+role in states %}
{%- endif -%}
{%- endfor -%}
{%- else -%}
{%- for role in roles %}
{%- if 'pillars.roles.backup.'+role in states %}
- roles.backup.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}

27
pillars/roles/ca/init.sls
View file

@ -1,21 +1,20 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.ca.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- if 'ca' in grains['roles'] -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.ca.") -%}
{%- set role = state.split('.')[3] %}
{%- if roles is not none -%}
{%- if 'ca' in roles -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.ca.") -%}
{%- set role = state.split('.')[3] %}
- roles.ca.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- else -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.ca.'+role in states %}
{%- endif -%}
{%- endfor -%}
{%- else -%}
{%- for role in roles %}
{%- if 'pillars.roles.ca.'+role in states %}
- roles.ca.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}

17
pillars/roles/database/init.sls
View file

@ -1,15 +1,14 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.database.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- if 'mysql' in grains['roles'] -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.database.") -%}
{%- set role = state.split('.')[3] %}
{%- if roles is not none -%}
{%- if 'mysql' in roles -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.database.") -%}
{%- set role = state.split('.')[3] %}
- roles.database.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}

13
pillars/roles/firewalld/init.sls
View file

@ -1,13 +1,12 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.firewalld.core
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.firewalld.'+role in states %}
{%- if roles is not none -%}
{%- for role in roles %}
{%- if 'pillars.roles.firewalld.'+role in states %}
- roles.firewalld.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}

13
pillars/roles/git/init.sls
View file

@ -1,13 +1,12 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.git.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.git.'+role in states %}
{%- if roles is not none -%}
{%- for role in roles %}
{%- if 'pillars.roles.git.'+role in states %}
- roles.git.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}

13
pillars/roles/gitea/init.sls
View file

@ -1,13 +0,0 @@
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.git.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.git.'+role in states %}
- roles.git.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}

0
pillars/roles/gitea/none.sls
View file

25
pillars/roles/gitea/portal.sls
View file

@ -1,25 +0,0 @@
git:
tmux-root:
repo: "ssh://gitea@git.actcur.com:5022/actcur/tmux.git"
path: "/root/tmux"
branch: "master"
key: "git_actcur"
force: true
email: "actcur@actcur.com"
name: "Actaeus Curabitur"
tmux-ejparker:
repo: "ssh://gitea@git.actcur.com:5022/actcur/tmux.git"
path: "/ejparker/tmux"
branch: "master"
key: "git_actcur"
force: true
email: "actcur@actcur.com"
name: "Actaeus Curabitur"
web:
repo: "ssh://gitea@git.actcur.com:5022/actcur/portal.git"
path: "/srv/http/portal"
branch: "master"
key: "git_actcur"
force: true
email: "actcur@actcur.com"
name: "Actaeus Curabitur"

17
pillars/roles/gitea/saltmaster.sls
View file

@ -1,17 +0,0 @@
git:
salt:
repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
path: "/srv/salt/prod"
branch: "master"
key: "git_actcur"
force: true
email: "actcur@actcur.com"
name: "Actaeus Curabitur"
salt_dev:
repo: "ssh://gitea@git.actcur.com:5022/actcur/salt.git"
path: "/srv/salt/dev"
branch: "dev"
key: "git_actcur"
force: true
email: "actcur@actcur.com"
name: "Actaeus Curabitur"

9
pillars/roles/gitea/ytdownloader.sls
View file

@ -1,9 +0,0 @@
git:
ytdownloader:
repo: "ssh://gitea@git.actcur.com:5022/actcur/ytdownloader.git"
path: "/root/scripts/ytdownloader"
branch: "master"
key: "git_actcur"
force: true
email: "actcur@actcur.com"
name: "Actaeus Curabitur"

13
pillars/roles/host/init.sls
View file

@ -1,13 +1,12 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.host.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.host.'+role in states %}
{%- if roles is not none -%}
{%- for role in roles %}
{%- if 'pillars.roles.host.'+role in states %}
- roles.host.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}

13
pillars/roles/laradev/init.sls
View file

@ -1,13 +1,12 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.laradev.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.laradev.'+role in states %}
{%- if roles is not none -%}
{%- for role in roles %}
{%- if 'pillars.roles.laradev.'+role in states %}
- roles.laradev.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}

13
pillars/roles/lxc/init.sls
View file

@ -1,13 +1,12 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.lxc.container_profiles
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.lxc.'+role in states %}
{%- if roles is not none -%}
{%- for role in roles %}
{%- if 'pillars.roles.lxc.'+role in states %}
- roles.lxc.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}

13
pillars/roles/mount/init.sls
View file

@ -1,13 +1,12 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.mount.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.mount.'+role in states %}
{%- if roles is not none -%}
{%- for role in roles %}
{%- if 'pillars.roles.mount.'+role in states %}
- roles.mount.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}

27
pillars/roles/nginx/init.sls
View file

@ -1,21 +1,20 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.nginx.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- if 'portal' in grains['roles'] -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.nginx.") -%}
{%- set role = state.split('.')[3] %}
{%- if roles is not none -%}
{%- if 'portal' in roles -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.nginx.") -%}
{%- set role = state.split('.')[3] %}
- roles.nginx.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- else -%}
{%- for role in grains['roles'] %}
{%- if 'pillars.roles.nginx.'+role in states %}
{%- endif -%}
{%- endfor -%}
{%- else -%}
{%- for role in roles %}
{%- if 'pillars.roles.nginx.'+role in states %}
- roles.nginx.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}

17
pillars/roles/router/init.sls
View file

@ -1,15 +1,14 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.router.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- if 'router' in grains['roles'] -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.router.") -%}
{%- set role = state.split('.')[3] %}
{%- if roles is not none -%}
{%- if 'router' in roles -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.router.") -%}
{%- set role = state.split('.')[3] %}
- roles.router.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}

17
pillars/roles/services/init.sls
View file

@ -1,15 +1,14 @@
{%- from "roles.jinja" import roles with context %}
{% set states = salt['cp.list_states'](saltenv) %}
include:
- roles.services.none
{%- if grains['roles'] is defined -%}
{%- if grains['roles'] is not none -%}
{%- if 'icinga' in grains['roles'] -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.services.") -%}
{%- set role = state.split('.')[3] %}
{%- if roles is not none -%}
{%- if 'icinga' in roles -%}
{%- for state in states %}
{%- if state.startswith("pillars.roles.services.") -%}
{%- set role = state.split('.')[3] %}
- roles.services.{{ role }}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}
{%- endfor -%}
{%- endif -%}
{%- endif -%}

4
states/roles/maintain/pkg-cache/cache.conf
View file

@ -34,11 +34,11 @@ server {
}
location ~ \.(db|sig) {
proxy_pass https://mirrors.kernel.org$request_uri;
proxy_pass https://mirrors.advancedhosters.com$request_uri;
}
location / {
proxy_pass https://mirrors.kernel.org;
proxy_pass https://mirrors.advancedhosters.com;
proxy_cache pkg-cache; # This directive should match the keys_zone option
proxy_cache_revalidate on;
proxy_cache_min_uses 0;