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

Compare commits

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

4 commits
f6c6e6f42f ... 01f1640a0f

Author SHA1 Message Date
Actaeus Curabitur
01f1640a0f . 2022-09-01 05:34:41 -05:00
Actaeus Curabitur
dc641bebf1 updated pkg cache 2022-09-01 05:27:09 -05:00
Actaeus Curabitur
ff2b880490 updated pkg cache 2022-09-01 05:25:13 -05:00
Actaeus Curabitur
1ba2bcffc8 updated nextcloud php ini 2022-08-31 10:41:58 -05:00
46 changed files with 1981 additions and 21 deletions
Show stats Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1
pillars/servers/init.sls
View file

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

1
pillars/servers/mkserver.sh
View file

@ -1,3 +1,4 @@
#!/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,7 +4,6 @@ nextcloud-pkgs:
- nextcloud - nextcloud
- php-gd - php-gd
- php-intl - php-intl
- php-imagick
- nginx - nginx
- openldap - openldap
@ -28,12 +27,6 @@ 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/
@ -128,10 +121,6 @@ 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
@ -144,9 +133,15 @@ nextcloud-cron.timer:
# - addusers: # - addusers:
# - http # - http
#/usr/share/webapps/nextcloud/apps: nginx-service:
# file.directory: service.running:
# - user: root - name: nginx
# - group: root - watch:
# - dir_mode: 755 - file: /etc/nginx/conf.d/nextcloud.conf
/usr/share/webapps/nextcloud/apps:
file.directory:
- user: nextcloud
- group: nextcloud
- dir_mode: 750

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

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

1921
states/roles/maintain/nextcloud/nextcloud-php.ini.tmp Normal file
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] = /mnt/$pool:/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] = /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,4 +3,3 @@ 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/saltminion/minion
View file

@ -347,8 +347,12 @@ 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.
saltenv: {{ saltenv }} {%- set env="dev" -%}
pillarenv: {{ saltenv }} {%- if pillar['env'] is defined -%}
{%- 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.