mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-08-26 21:45:20 +02:00
Solved svc-opt-ssd-hdd path bug
This commit is contained in:
parent
95aba805c0
commit
838a8fc7a1
@ -4,8 +4,8 @@ credentials:
|
|||||||
algorithm: "bcrypt"
|
algorithm: "bcrypt"
|
||||||
validation: "^\\$2[aby]\\$.{56}$"
|
validation: "^\\$2[aby]\\$.{56}$"
|
||||||
|
|
||||||
OPT_DRIVE_RAPID_STORAGE_PATH:
|
rapid_storage:
|
||||||
description: "Mount path of the servers SSD"
|
description: "Mount path of the servers SSD"
|
||||||
|
|
||||||
OPT_DRIVE_MASS_STORAGE_PATH:
|
mass_storage:
|
||||||
description: "Mount path of the servers HDD"
|
description: "Mount path of the servers HDD"
|
@ -1,2 +1,5 @@
|
|||||||
- include_role:
|
- include_role:
|
||||||
name: sys-service
|
name: sys-service
|
||||||
|
vars:
|
||||||
|
system_service_tpl_exec_start_pre: '/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(" ") }} --ignore {{ SYS_SERVICE_OPTIMIZE_DRIVE }} {{ SYS_SERVICE_BACKUP_RMT_2_LOC }} --timeout "{{ SYS_TIMEOUT_STORAGE_OPTIMIZER }}"'
|
||||||
|
system_service_tpl_exec_start: '{{ system_service_script_exec }} --mass-storage-path {{ OPT_DRIVE_MASS_STORAGE_PATH }} --rapid-storage-path {{ OPT_DRIVE_RAPID_STORAGE_PATH }}'
|
@ -1,8 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=Optimize storage paths
|
|
||||||
OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=oneshot
|
|
||||||
ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ') }} --ignore {{ SYS_SERVICE_OPTIMIZE_DRIVE }} {{ SYS_SERVICE_BACKUP_RMT_2_LOC }} --timeout "{{ SYS_TIMEOUT_STORAGE_OPTIMIZER }}"
|
|
||||||
ExecStart={{ system_service_script_exec }} --mass-storage-path {{ OPT_DRIVE_MASS_STORAGE_PATH }}
|
|
@ -1,4 +1,4 @@
|
|||||||
application_id: svc-opt-ssd-hdd
|
application_id: svc-opt-ssd-hdd
|
||||||
system_service_id: "{{ application_id }}"
|
system_service_id: "{{ application_id }}"
|
||||||
OPT_DRIVE_RAPID_STORAGE_PATH: "{{ applications | get_app_conf(application_id, 'volumes.rapid_storage') }}"
|
OPT_DRIVE_RAPID_STORAGE_PATH: "{{ applications | get_app_conf(application_id, 'volumes.rapid_storage') }}"
|
||||||
OPT_DRIVE_MASS_STORAGE_PATH: "{{ applications | get_app_conf(application_id, 'volumes.mass_storage') }}"
|
OPT_DRIVE_MASS_STORAGE_PATH: "{{ applications | get_app_conf(application_id, 'volumes.mass_storage') }}"
|
||||||
|
@ -6,6 +6,9 @@ OnFailure={{ system_service_tpl_on_failure }}
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type={{ system_service_tpl_type }}
|
Type={{ system_service_tpl_type }}
|
||||||
|
{% if system_service_tpl_exec_start_pre |length > 0 %}
|
||||||
|
ExecStartPre={{ system_service_tpl_exec_start_pre }}
|
||||||
|
{% endif %}
|
||||||
ExecStart={{ system_service_tpl_exec_start }}
|
ExecStart={{ system_service_tpl_exec_start }}
|
||||||
{% if system_service_tpl_runtime |length > 0 %}
|
{% if system_service_tpl_runtime |length > 0 %}
|
||||||
RuntimeMaxSec={{ system_service_tpl_runtime }}
|
RuntimeMaxSec={{ system_service_tpl_runtime }}
|
||||||
|
@ -17,7 +17,8 @@ system_service_script_inter: "/bin/{{ 'bash' if system_service_script_type ==
|
|||||||
system_service_script_exec: "{{ system_service_script_inter }} {{ system_service_id | get_service_script_path( system_service_script_type ) }}"
|
system_service_script_exec: "{{ system_service_script_inter }} {{ system_service_id | get_service_script_path( system_service_script_type ) }}"
|
||||||
|
|
||||||
# Service template
|
# Service template
|
||||||
system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
|
system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
|
||||||
system_service_tpl_type: "oneshot"
|
system_service_tpl_type: "oneshot"
|
||||||
system_service_tpl_exec_start: "{{ system_service_script_exec }}"
|
system_service_tpl_exec_start: "{{ system_service_script_exec }}"
|
||||||
system_service_tpl_runtime: "{{ SYS_SERVICE_DEFAULT_RUNTIME }}"
|
system_service_tpl_runtime: "{{ SYS_SERVICE_DEFAULT_RUNTIME }}"
|
||||||
|
system_service_tpl_exec_start_pre: ""
|
@ -1,14 +1,14 @@
|
|||||||
docker:
|
docker:
|
||||||
services:
|
services:
|
||||||
redis:
|
redis:
|
||||||
enabled: false # No redis needed
|
enabled: false # No redis needed
|
||||||
database:
|
database:
|
||||||
enabled: false # No database needed
|
enabled: false # No database needed
|
||||||
features:
|
features:
|
||||||
matomo: true # activate tracking
|
matomo: true # activate tracking
|
||||||
css: true # use custom infinito stile
|
css: true # use custom infinito stile
|
||||||
desktop: true # Enable in port-ui
|
desktop: true # Enable in port-ui
|
||||||
logout: false
|
logout: false
|
||||||
server:
|
server:
|
||||||
csp:
|
csp:
|
||||||
whitelist:
|
whitelist:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user