diff --git a/roles/mayan_edms/templates/env.j2 b/roles/mayan_edms/templates/env.j2 index 7136ec3..6c80ad8 100644 --- a/roles/mayan_edms/templates/env.j2 +++ b/roles/mayan_edms/templates/env.j2 @@ -14,5 +14,5 @@ MAYAN_DOCUMENTS_LANGUAGE={{ mayan_doc_lang }} MAYAN_SECURE_PROXY_SSL_HEADER="('HTTP_X_FORWARDED_PROTO', 'https')" MAYAN_SESSION_COOKIE_NAME="mayanedmssessionid" MAYAN_STORAGE_TEMPORARY_DIRECTORY="{{ mayan_root_dir }}/tmp" -MAYAN_TIME_ZONE={{ system_tz | default('UTC') }} +MAYAN_TIME_ZONE="{{ system_tz | default('UTC') }}" MAYAN_USE_X_FORWARDED_HOST="true" diff --git a/roles/mayan_edms/templates/mayan-edms-beat.service.j2 b/roles/mayan_edms/templates/mayan-edms-beat.service.j2 index f1c9452..0e91f6d 100644 --- a/roles/mayan_edms/templates/mayan-edms-beat.service.j2 +++ b/roles/mayan_edms/templates/mayan-edms-beat.service.j2 @@ -6,7 +6,7 @@ After=redis.service {{ (pg_version is defined and pg_version != 'default') | ter User={{ mayan_user }} WorkingDirectory={{ mayan_root_dir }} EnvironmentFile={{ mayan_root_dir }}/config/.env -ExecStart={{ mayan_root_dir }}/venv/bin/celery beat -A mayan --pidfile= -l INFO +ExecStart={{ mayan_root_dir }}/venv/bin/celery beat -A mayan --pidfile= -l ERROR PrivateTmp=yes ProtectSystem=full ProtectHome=yes diff --git a/roles/mayan_edms/templates/mayan-edms-worker-fast.service.j2 b/roles/mayan_edms/templates/mayan-edms-worker-fast.service.j2 index dbf9295..4956c75 100644 --- a/roles/mayan_edms/templates/mayan-edms-worker-fast.service.j2 +++ b/roles/mayan_edms/templates/mayan-edms-worker-fast.service.j2 @@ -6,7 +6,7 @@ After=redis.service {{ (pg_version is defined and pg_version != 'default') | ter User={{ mayan_user }} WorkingDirectory={{ mayan_root_dir }}/ EnvironmentFile={{ mayan_root_dir }}/config/.env -ExecStart={{ mayan_root_dir }}/venv/bin/celery worker -A mayan -Ofair -l INFO -Q document_states_fast,converter,sources_fast -n mayan-worker-fast.%%h --concurrency=1 +ExecStart={{ mayan_root_dir }}/venv/bin/celery worker -A mayan -Ofair -l ERROR -Q document_states_fast,converter,sources_fast -n mayan-worker-fast.%%h --concurrency=1 Nice=1 PrivateTmp=yes ProtectSystem=full diff --git a/roles/mayan_edms/templates/mayan-edms-worker-medium.service.j2 b/roles/mayan_edms/templates/mayan-edms-worker-medium.service.j2 index bab4cd9..9e7e7c0 100644 --- a/roles/mayan_edms/templates/mayan-edms-worker-medium.service.j2 +++ b/roles/mayan_edms/templates/mayan-edms-worker-medium.service.j2 @@ -6,7 +6,7 @@ After=redis.service {{ (pg_version is defined and pg_version != 'default') | ter User={{ mayan_user }} WorkingDirectory={{ mayan_root_dir }}/ EnvironmentFile={{ mayan_root_dir }}/config/.env -ExecStart={{ mayan_root_dir }}/venv/bin/celery worker -A mayan -Ofair -l INFO -Q statistics,default,checkouts_periodic,indexing,signatures,documents_periodic,uploads,documents,file_metadata,metadata,sources,sources_periodic -n mayan-worker-medium.%%h --concurrency=1 +ExecStart={{ mayan_root_dir }}/venv/bin/celery worker -A mayan -Ofair -l ERROR -Q statistics,default,checkouts_periodic,indexing,signatures,documents_periodic,uploads,documents,file_metadata,metadata,sources,sources_periodic -n mayan-worker-medium.%%h --concurrency=1 Nice=18 PrivateTmp=yes ProtectSystem=full diff --git a/roles/mayan_edms/templates/mayan-edms-worker-slow.service.j2 b/roles/mayan_edms/templates/mayan-edms-worker-slow.service.j2 index 57d74e4..1d1767c 100644 --- a/roles/mayan_edms/templates/mayan-edms-worker-slow.service.j2 +++ b/roles/mayan_edms/templates/mayan-edms-worker-slow.service.j2 @@ -6,7 +6,7 @@ After=redis.service {{ (pg_version is defined and pg_version != 'default') | ter User={{ mayan_user }} WorkingDirectory={{ mayan_root_dir }}/ EnvironmentFile={{ mayan_root_dir }}/config/.env -ExecStart={{ mayan_root_dir }}/venv/bin/celery worker -A mayan -Ofair -l INFO -Q tools,search,parsing,document_states,mailing,ocr,storage_periodic -n mayan-worker-slow.%%h --concurrency=1 +ExecStart={{ mayan_root_dir }}/venv/bin/celery worker -A mayan -Ofair -l ERROR -Q tools,search,parsing,document_states,mailing,ocr,storage_periodic -n mayan-worker-slow.%%h --concurrency=1 Nice=19 PrivateTmp=yes ProtectSystem=full diff --git a/roles/squid/files/ufdb.te b/roles/squid/files/ufdb.te index 1beef2e..6f58d2e 100644 --- a/roles/squid/files/ufdb.te +++ b/roles/squid/files/ufdb.te @@ -2,6 +2,7 @@ module ufdb 1.2; require { type initrc_tmp_t; + type initrc_t; type tmp_t; type squid_t; class sock_file write; diff --git a/roles/squid/handlers/main.yml b/roles/squid/handlers/main.yml index c4aa432..f74b5ac 100644 --- a/roles/squid/handlers/main.yml +++ b/roles/squid/handlers/main.yml @@ -13,11 +13,11 @@ service: name=squid-clamd state={{ squid_scan_av | ternary('restarted', 'stopped') }} - name: restart ufdb - service: name=ufdb state={{ squid_filter_url | ternary('restarted', 'stopped') }} + service: name={{ squid_ufdb_unit.stat.exists | ternary('ufdbGuard','ufdb') }} state={{ squid_filter_url | ternary('restarted', 'stopped') }} - name: update ufdb command: /usr/local/bin/ufdb_update.sh notify: reload ufdb - name: reload ufdb - service: name=ufdb state={{ squid_filter_url | ternary('reloaded', 'stopped') }} + service: name={{ squid_ufdb_unit.stat.exists | ternary('ufdbGuard','ufdb') }} state={{ squid_filter_url | ternary('reloaded', 'stopped') }}