Compare commits
6 commits
0b4877218e
...
d3d34a68f1
Author | SHA1 | Date | |
---|---|---|---|
|
d3d34a68f1 | ||
|
9f8e3eb0a8 | ||
|
0174b6effb | ||
|
6bf8b07aee | ||
|
0ca3588275 | ||
|
e83ba523a5 |
6 changed files with 15 additions and 3 deletions
9
pillars/envs.sls
Normal file
9
pillars/envs.sls
Normal file
|
@ -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 -%}
|
|
@ -4,4 +4,5 @@
|
||||||
'*':
|
'*':
|
||||||
- roles
|
- roles
|
||||||
- servers
|
- servers
|
||||||
|
- envs
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|
|
@ -66,6 +66,7 @@ nginx-service:
|
||||||
- user: nextcloud
|
- user: nextcloud
|
||||||
- group: nextcloud
|
- group: nextcloud
|
||||||
- mode: 644
|
- mode: 644
|
||||||
|
- replace: false
|
||||||
- template: jinja
|
- template: jinja
|
||||||
|
|
||||||
/etc/pacman.d/hooks/nextcloud.hook:
|
/etc/pacman.d/hooks/nextcloud.hook:
|
||||||
|
|
|
@ -6,6 +6,7 @@ $CONFIG = array (
|
||||||
1 => 'cloud.actcur.com'
|
1 => 'cloud.actcur.com'
|
||||||
),
|
),
|
||||||
'overwrite.cli.url' => 'https://cloud.actcur.com/',
|
'overwrite.cli.url' => 'https://cloud.actcur.com/',
|
||||||
|
'overwriteprotocol' => 'https',
|
||||||
'htaccess.RewriteBase' => '/',
|
'htaccess.RewriteBase' => '/',
|
||||||
'datadirectory' => '/mnt/nextcloud/data',
|
'datadirectory' => '/mnt/nextcloud/data',
|
||||||
'logfile' => '/var/log/nextcloud/nextcloud.log',
|
'logfile' => '/var/log/nextcloud/nextcloud.log',
|
||||||
|
|
|
@ -7,6 +7,8 @@ server {
|
||||||
listen 8000;
|
listen 8000;
|
||||||
server_name pkg.actcur.com;
|
server_name pkg.actcur.com;
|
||||||
|
|
||||||
|
resolver 8.8.8.8;
|
||||||
|
|
||||||
access_log /var/log/nginx/pkg-cache.access.log pkg-cache;
|
access_log /var/log/nginx/pkg-cache.access.log pkg-cache;
|
||||||
error_log /var/log/nginx/pkg-cache.error.log;
|
error_log /var/log/nginx/pkg-cache.error.log;
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
|
|
||||||
{%- set states = salt['cp.list_states'](saltenv) -%}
|
{%- 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 }}:
|
{{ env }}:
|
||||||
'os_family:RedHat':
|
'os_family:RedHat':
|
||||||
- match: grain_pcre
|
- match: grain_pcre
|
||||||
|
|
Loading…
Add table
Reference in a new issue