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

Updated nextcloud configuration, changed environment determination/switching, updated host ssh_key

Browse source
This commit is contained in:
Actaeus Curabitur 2022-09-01 10:46:48 -05:00
parent 14fb9ccc26
commit 7df406178c
46 changed files with 21 additions and 1981 deletions
Show stats Download patch file Download diff file 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:
- servers.env
- servers.roles

1
pillars/servers/mkserver.sh
View file

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

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

@ -928,7 +928,7 @@ extension=intl
;extension=odbc
;zend_extension=opcache
;extension=pdo_dblib
extension=pdo_mysql
;extension=pdo_mysql
;extension=pdo_odbc
;extension=pdo_pgsql
;extension=pdo_sqlite

1921
states/roles/maintain/nextcloud/nextcloud-php.ini.tmp
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[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
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
ReadWritePaths=/var/lib/nextcloud
ReadWritePaths=/etc/webapps/nextcloud/config
ReadWritePaths=/mnt/nextcloud

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
# by statically setting it. Remember that the recommended way to manage
# environments is to isolate via the top file.
{%- set env="dev" -%}
{%- if pillar['env'] is defined -%}
{%- set env=pillar['env'] -%}
{%- endif %}
saltenv: {{ env }}
pillarenv: {{ env }}
saltenv: {{ saltenv }}
pillarenv: {{ saltenv }}
#
# If using the local file directory, then the state top file name needs to be
# defined, by default this is top.sls.