From a08d8c91533a96ca0d918e21849d6b6c6d4acedf Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 6 Sep 2025 23:52:29 -0700 Subject: [PATCH] remove j2 extension from templates --- defaults/main.yaml | 2 +- tasks/mediamtx.yaml | 2 +- tasks/sd_handler.yaml | 6 +++--- tasks/service_control.yaml | 10 +++++----- tasks/streamer.yaml | 4 ++-- templates/{app-service.py.j2 => app-service.py} | 0 ...l-index.yaml.j2 => docker-compose-local-index.yaml} | 0 ...ker-compose-php.yaml.j2 => docker-compose-php.yaml} | 0 ...mtx_service.service.j2 => mediamtx_service.service} | 0 ...vice_control.service.j2 => service_control.service} | 0 ...vice_timeout.service.j2 => service_timeout.service} | 0 .../{service_timeout.sh.j2 => service_timeout.sh} | 0 ...tream_service.service.j2 => stream_service.service} | 0 templates/{stream_service.sh.j2 => stream_service.sh} | 0 14 files changed, 12 insertions(+), 12 deletions(-) rename templates/{app-service.py.j2 => app-service.py} (100%) rename templates/{docker-compose-local-index.yaml.j2 => docker-compose-local-index.yaml} (100%) rename templates/{docker-compose-php.yaml.j2 => docker-compose-php.yaml} (100%) rename templates/{mediamtx_service.service.j2 => mediamtx_service.service} (100%) rename templates/{service_control.service.j2 => service_control.service} (100%) rename templates/{service_timeout.service.j2 => service_timeout.service} (100%) rename templates/{service_timeout.sh.j2 => service_timeout.sh} (100%) rename templates/{stream_service.service.j2 => stream_service.service} (100%) rename templates/{stream_service.sh.j2 => stream_service.sh} (100%) diff --git a/defaults/main.yaml b/defaults/main.yaml index 8e6c30a..dec3a5c 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -59,7 +59,7 @@ mediamtx_configs: - search_string: 'recordPath' line: ' recordPath: {{ recording_capture_folder }}/%path/%Y-%m-%d_%H-%M/%H-%M-%S-%f' - search_string: 'recordSegmentDuration' - line: ' recordSegmentDuration: 3600s' + line: ' recordSegmentDuration: 21600s' - search_string: 'recordDeleteAfter' line: ' recordDeleteAfter: 0s' - search_string: 'recordMaxPartSize' diff --git a/tasks/mediamtx.yaml b/tasks/mediamtx.yaml index a97d447..7dae885 100644 --- a/tasks/mediamtx.yaml +++ b/tasks/mediamtx.yaml @@ -51,7 +51,7 @@ - name: MediaMTX - create service file template: - src: mediamtx_service.service.j2 + src: mediamtx_service.service dest: "/etc/systemd/system/mediamtx_service.service" mode: 0644 diff --git a/tasks/sd_handler.yaml b/tasks/sd_handler.yaml index ac9b03f..23395f2 100644 --- a/tasks/sd_handler.yaml +++ b/tasks/sd_handler.yaml @@ -145,8 +145,8 @@ lineinfile: path: "/etc/samba/smb.conf" search_string: "/etc/samba/smb.conf.d/vcr_rip.conf" - line: "include /etc/samba/smb.conf.d/vcr_rip.conf" - insertafter: '[global]' + line: "include = /etc/samba/smb.conf.d/vcr_rip.conf" + insertbefore: '[global]' - name: SD Handler - restart smbd service: @@ -202,7 +202,7 @@ - name: SD Handler - - local-index - Copy config template: - src: docker-compose-local-index.yaml.j2 + src: docker-compose-local-index.yaml dest: "{{ streaming_working_folder }}/local-index/docker-compose.yaml" mode: 0644 diff --git a/tasks/service_control.yaml b/tasks/service_control.yaml index 7f91556..d288fae 100644 --- a/tasks/service_control.yaml +++ b/tasks/service_control.yaml @@ -29,7 +29,7 @@ # Copy API Code - name: video_capture - service_control api - copy api code template: - src: app-service.py.j2 + src: app-service.py dest: "{{ service_control_folder }}/app.py" mode: 0644 @@ -57,7 +57,7 @@ - name: video_capture - service_control api - create service file # vars: template: - src: service_control.service.j2 + src: service_control.service dest: /etc/systemd/system/service_control.service mode: 0644 @@ -66,13 +66,13 @@ - name: video_capture - create service_timeout.sh template: - src: service_timeout.sh.j2 + src: service_timeout.sh dest: "{{ service_control_folder }}/service_timeout.sh" mode: 0755 - name: video_capture - create service_timeout.service template: - src: service_timeout.service.j2 + src: service_timeout.service dest: /etc/systemd/system/service_timeout.service mode: 0644 @@ -139,7 +139,7 @@ - name: service_control_website - template config template: - src: docker-compose-php.yaml.j2 + src: docker-compose-php.yaml dest: "{{ service_control_web_folder }}/docker-compose.yaml" mode: 0644 diff --git a/tasks/streamer.yaml b/tasks/streamer.yaml index 7bfbe80..23ab770 100644 --- a/tasks/streamer.yaml +++ b/tasks/streamer.yaml @@ -51,13 +51,13 @@ - name: video_capture - streamer - copy service script template: - src: stream_service.sh.j2 + src: stream_service.sh dest: "{{ streaming_working_folder }}/stream_service.sh" mode: 0755 - name: video_capture - streamer - create service file template: - src: stream_service.service.j2 + src: stream_service.service dest: /etc/systemd/system/stream_service.service mode: 0644 diff --git a/templates/app-service.py.j2 b/templates/app-service.py similarity index 100% rename from templates/app-service.py.j2 rename to templates/app-service.py diff --git a/templates/docker-compose-local-index.yaml.j2 b/templates/docker-compose-local-index.yaml similarity index 100% rename from templates/docker-compose-local-index.yaml.j2 rename to templates/docker-compose-local-index.yaml diff --git a/templates/docker-compose-php.yaml.j2 b/templates/docker-compose-php.yaml similarity index 100% rename from templates/docker-compose-php.yaml.j2 rename to templates/docker-compose-php.yaml diff --git a/templates/mediamtx_service.service.j2 b/templates/mediamtx_service.service similarity index 100% rename from templates/mediamtx_service.service.j2 rename to templates/mediamtx_service.service diff --git a/templates/service_control.service.j2 b/templates/service_control.service similarity index 100% rename from templates/service_control.service.j2 rename to templates/service_control.service diff --git a/templates/service_timeout.service.j2 b/templates/service_timeout.service similarity index 100% rename from templates/service_timeout.service.j2 rename to templates/service_timeout.service diff --git a/templates/service_timeout.sh.j2 b/templates/service_timeout.sh similarity index 100% rename from templates/service_timeout.sh.j2 rename to templates/service_timeout.sh diff --git a/templates/stream_service.service.j2 b/templates/stream_service.service similarity index 100% rename from templates/stream_service.service.j2 rename to templates/stream_service.service diff --git a/templates/stream_service.sh.j2 b/templates/stream_service.sh similarity index 100% rename from templates/stream_service.sh.j2 rename to templates/stream_service.sh