Merge remote-tracking branch 'origin/prod' into fix_grains

pillars/roles.jinja

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

pillars/roles/aurpkgs/init.sls

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

pillars/roles/backup/init.sls

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

pillars/roles/ca/init.sls

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

pillars/roles/database/init.sls

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

pillars/roles/firewalld/init.sls

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

pillars/roles/git/init.sls

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

pillars/roles/gitea/init.sls

@@ -0,0 +1,13 @@
+{% 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 -%}

pillars/roles/gitea/portal.sls

@@ -0,0 +1,25 @@
+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"

pillars/roles/gitea/saltmaster.sls

@@ -0,0 +1,17 @@
+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"

pillars/roles/gitea/ytdownloader.sls

@@ -0,0 +1,9 @@
+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"

pillars/roles/host/init.sls

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

pillars/roles/laradev/init.sls

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

pillars/roles/lxc/init.sls

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

pillars/roles/mount/init.sls

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

pillars/roles/nginx/init.sls

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

pillars/roles/router/init.sls

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

pillars/roles/services/init.sls

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