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

pillars/envs.sls

@@ -1,9 +0,0 @@
-{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
-envs:
-{%- if envs is not none -%}
-  {%- for env in envs %}
-  - {{env}}
-  {%- endfor -%}
-{%- else -%}
-  - prod
-{%- endif -%}

pillars/top.sls

@@ -4,5 +4,4 @@
   '*':
     - roles
     - servers
-    - envs
 {%- endfor %}

states/roles/maintain/nextcloud/init.sls

@@ -66,7 +66,6 @@ nginx-service:
     - user: nextcloud
     - group: nextcloud
     - mode: 644
-    - replace: false
     - template: jinja
     
 /etc/pacman.d/hooks/nextcloud.hook:

states/roles/maintain/nextcloud/nextcloud-config.php

@@ -6,7 +6,6 @@ $CONFIG = array (
     1 => 'cloud.actcur.com'
   ),
   'overwrite.cli.url' => 'https://cloud.actcur.com/',
-  'overwriteprotocol' => 'https',
   'htaccess.RewriteBase' => '/',
   'datadirectory' => '/mnt/nextcloud/data',
   'logfile' => '/var/log/nextcloud/nextcloud.log',

states/roles/maintain/pkg-cache/cache.conf

@@ -7,8 +7,6 @@ server {
         listen 8000;
         server_name pkg.actcur.com;
 
-        resolver 8.8.8.8;
-
         access_log /var/log/nginx/pkg-cache.access.log pkg-cache;
         error_log /var/log/nginx/pkg-cache.error.log;
 

states/top.sls

@@ -1,6 +1,8 @@
 
 {%- set states = salt['cp.list_states'](saltenv) -%}
-{% for env in pillar['envs'] %}
+{%- set envs=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
+{% for env in envs %}
 {{ env }}:
   'os_family:RedHat':
     - match: grain_pcre