actcur/salt
3
0
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity

Compare commits

base: actcur:01f1640a0fde7abf9f9d82f830877402dd02610d
Branches Tags
actcur:prod
actcur:dev
actcur:seer
actcur:nginx
actcur:bazarr
actcur:qual
actcur:matrix
actcur:fix_secrets
...
compare: actcur:f6c6e6f42f3a7c926f4cc95438b34b7f9d2c58b9
Branches Tags
actcur:prod
actcur:dev
actcur:seer
actcur:nginx
actcur:bazarr
actcur:qual
actcur:matrix
actcur:fix_secrets

11 commits
01f1640a0f ... f6c6e6f42f

Author SHA1 Message Date
Actaeus Curabitur
f6c6e6f42f a 2022-09-01 10:38:14 -05:00
Actaeus Curabitur
4626dad6f6 no apps folder 2022-09-01 10:06:03 -05:00
Actaeus Curabitur
52f597bc73 reenabled top 2022-09-01 10:02:25 -05:00
Actaeus Curabitur
dc31eab5fd fixed permission issue 2022-09-01 10:00:53 -05:00
Actaeus Curabitur
0d360faeb8 added imagick 2022-09-01 09:25:16 -05:00
Actaeus Curabitur
002104b30d disabled top 2022-09-01 09:19:51 -05:00
Actaeus Curabitur
d1c1d8a0f4 temporarily disable cloud.actcur.com 2022-09-01 09:10:48 -05:00
Actaeus Curabitur
7991901af9 removed line 2022-09-01 08:11:48 -05:00
Actaeus Curabitur
a2714e4179 changed how environment is determined - it will now automatically switch between dev/prod when one is explicitly called 2022-09-01 08:08:02 -05:00
Actaeus Curabitur
1fe8b4313e . 2022-09-01 06:30:16 -05:00
Actaeus Curabitur
14fb9ccc26 Updated pkg-cache to handle db and sig files properly 2022-09-01 05:35:20 -05:00
46 changed files with 420 additions and 432 deletions
Show stats Expand all files Collapse all files

2
pillars/servers/env/init.sls vendored
View file

@ -1,2 +0,0 @@
include:
- servers.env.server.{{ grains['host'] }}

1
pillars/servers/env/server/archtest.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/arr.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/atheos.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/authelia.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/baikal.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/base vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/bbs.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/ca.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/clark.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/cloud.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/emby.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/git.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/gitea.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/host.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/host2.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/icinga.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/ipa.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/jackett.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/lara.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/lidarr.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/ombi.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/pass.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/pkg.sls vendored
View file

@ -1 +0,0 @@
env: dev

1
pillars/servers/env/server/portal.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/project.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/radarr.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/router.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/rtorrent.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/salt.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/sonarr.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/sql.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/ssh.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/sync.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/transmission.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/tt.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/video.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/env/server/vpn.sls vendored
View file

@ -1 +0,0 @@
env: prod

1
pillars/servers/init.sls
View file

@ -1,3 +1,2 @@
include: include:
- servers.env
- servers.roles - servers.roles

1
pillars/servers/mkserver.sh
View file

@ -1,4 +1,3 @@
#!/bin/bash #!/bin/bash
cp env/server/base env/server/$1.sls
cp roles/server/base roles/server/$1.sls cp roles/server/base roles/server/$1.sls

27
states/roles/maintain/nextcloud/init.sls
View file

@ -4,6 +4,7 @@ nextcloud-pkgs:
- nextcloud - nextcloud
- php-gd - php-gd
- php-intl - php-intl
- php-imagick
- nginx - nginx
- openldap - openldap
@ -27,6 +28,12 @@ nextcloud-pkgs:
- mode: 755 - mode: 755
- makedirs: true - makedirs: true
nginx-service:
service.running:
- name: nginx
- watch:
- file: /etc/nginx/conf.d/nextcloud.conf
nextcloud-nginx-confd: nextcloud-nginx-confd:
file.directory: file.directory:
- name: /etc/nginx/conf.d/ - name: /etc/nginx/conf.d/
@ -121,6 +128,10 @@ nextcloud-php-fpm:
- group: root - group: root
- mode: 644 - mode: 644
nextcloud-cron.timer:
service.running:
- enable: true
/var/lib/nextcloud/data/.ocdata: /var/lib/nextcloud/data/.ocdata:
file.managed: file.managed:
- user: nextcloud - user: nextcloud
@ -133,15 +144,9 @@ nextcloud-php-fpm:
# - addusers: # - addusers:
# - http # - http
nginx-service: #/usr/share/webapps/nextcloud/apps:
service.running: # file.directory:
- name: nginx # - user: root
- watch: # - group: root
- file: /etc/nginx/conf.d/nextcloud.conf # - dir_mode: 755
/usr/share/webapps/nextcloud/apps:
file.directory:
- user: nextcloud
- group: nextcloud
- dir_mode: 750

765
states/roles/maintain/nextcloud/nextcloud-php.ini
View file

File diff suppressed because it is too large Load diff

2
states/roles/maintain/nextcloud/php-fpm-nextcloud.conf
View file

@ -467,7 +467,7 @@ env[TEMP] = /tmp
php_value[date.timezone] = America/Chicago php_value[date.timezone] = America/Chicago
php_value[open_basedir] = /var/lib/$pool:/tmp:/usr/share/webapps/$pool:/etc/webapps/$pool:/dev/urandom:/usr/lib/php/modules:/var/log/$pool:/proc/meminfo php_value[open_basedir] = /mnt/$pool:/var/lib/$pool:/tmp:/usr/share/webapps/$pool:/etc/webapps/$pool:/dev/urandom:/usr/lib/php/modules:/var/log/$pool:/proc/meminfo
; put session data in dedicated directory ; put session data in dedicated directory
php_value[session.save_path] = /var/lib/$pool/sessions php_value[session.save_path] = /var/lib/$pool/sessions

1
states/roles/maintain/nextcloud/php-fpm-override.conf
View file

@ -3,3 +3,4 @@ ExecStart=
ExecStart=/usr/bin/php-fpm --nodaemonize --fpm-config /etc/php/php-fpm.conf --php-ini /etc/php/php-fpm.ini ExecStart=/usr/bin/php-fpm --nodaemonize --fpm-config /etc/php/php-fpm.conf --php-ini /etc/php/php-fpm.ini
ReadWritePaths=/var/lib/nextcloud ReadWritePaths=/var/lib/nextcloud
ReadWritePaths=/etc/webapps/nextcloud/config ReadWritePaths=/etc/webapps/nextcloud/config
ReadWritePaths=/mnt/nextcloud

8
states/roles/maintain/pkg-cache/cache.conf
View file

@ -27,12 +27,16 @@ server {
proxy_read_timeout 300; proxy_read_timeout 300;
proxy_connect_timeout 300; proxy_connect_timeout 300;
location /archlinux/aur-local { location ~ aur-local {
root /mnt/pkgs; root /mnt/pkgs;
} }
location ~ \.(db|sig) {
proxy_pass https://mirrors.kernel.org$request_uri;
}
location / { location / {
proxy_pass http://repo.miserver.it.umich.edu/; proxy_pass https://mirrors.kernel.org;
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;

8
states/roles/maintain/saltminion/minion
View file

@ -347,12 +347,8 @@ master: salt.actcur.com
# when running states, but the environment can be isolated on the minion side # when running states, but the environment can be isolated on the minion side
# by statically setting it. Remember that the recommended way to manage # by statically setting it. Remember that the recommended way to manage
# environments is to isolate via the top file. # environments is to isolate via the top file.
{%- set env="dev" -%} saltenv: {{ saltenv }}
{%- if pillar['env'] is defined -%} pillarenv: {{ saltenv }}
{%- set env=pillar['env'] -%}
{%- endif %}
saltenv: {{ env }}
pillarenv: {{ env }}
# #
# If using the local file directory, then the state top file name needs to be # If using the local file directory, then the state top file name needs to be
# defined, by default this is top.sls. # defined, by default this is top.sls.