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

pillars/envs.sls

@@ -0,0 +1,9 @@
+{%- 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,4 +4,5 @@
   '*':
     - roles
     - servers
+    - envs
 {%- endfor %}

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

@@ -6,6 +6,7 @@ $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/top.sls

@@ -1,8 +1,6 @@
 
 {%- set states = salt['cp.list_states'](saltenv) -%}
-{%- 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') -%}
+{% for env in pillar['envs'] %}
-{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
-{% for env in envs %}
 {{ env }}:
   'os_family:RedHat':
     - match: grain_pcre