Compare commits

...

6 commits

Author SHA1 Message Date
Actaeus Curabitur
d3d34a68f1 don't overwrite nextcloud config - prevents constant update attempts due to incorrect version number. Might need different fix down the road 2022-11-08 09:31:52 -06:00
Actaeus Curabitur
9f8e3eb0a8 Merge remote-tracking branch 'origin/qual' into dev 2022-09-22 11:08:08 -05:00
Actaeus Curabitur
0174b6effb fix envs 2022-09-22 11:05:24 -05:00
Actaeus Curabitur
6bf8b07aee Merge remote-tracking branch 'origin/dev' into qual 2022-09-21 09:08:12 -05:00
Actaeus Curabitur
0ca3588275 added resolver to pkg-cache 2022-09-21 09:07:12 -05:00
Actaeus Curabitur
e83ba523a5 changed mirror for pkg cache - old mirror did redirects that prevented caching 2022-09-14 06:34:56 -05:00
6 changed files with 17 additions and 5 deletions

9
pillars/envs.sls Normal file
View 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 -%}

View file

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

View file

@ -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:

View file

@ -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',

View file

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

View file

@ -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