From aad1c23b5a2e7b5c256d9699b08c02cb7f2af803 Mon Sep 17 00:00:00 2001
From: Peter Nerlich <peter.nerlich+dev@googlemail.com>
Date: Sat, 23 Oct 2021 19:15:47 +0200
Subject: [PATCH] replace advtrains_luaautomation with sync patch version, ak
api endpoint
---
kif_minetest_server/defaults/main.yml | 5 ++++-
kif_minetest_server/tasks/install_mods.yml | 18 ++++++++++++++++++
kif_minetest_server/templates/minetest.conf.j2 | 1 +
testing.yml | 3 ++-
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/kif_minetest_server/defaults/main.yml b/kif_minetest_server/defaults/main.yml
index 9a48c53..20b4dc3 100644
--- a/kif_minetest_server/defaults/main.yml
+++ b/kif_minetest_server/defaults/main.yml
@@ -74,6 +74,7 @@ server_active_block_range: 6
server_secure_http_mods:
- mapserver
- ak_announcer
+ - advtrains_luaautomation_sync
mapserver_enable_crafting: true
mapserver_url: http://127.0.0.1:{{ mapserver_port }}
@@ -82,6 +83,7 @@ moreblocks_stairsplus_in_creative_inventory: false
advtrains_wagon_load_range: 192
advtrains_show_ids: true
advtrains_lines_rwt_realtime: follow_real
+ak_announcer_api_endpoint: https://ak.kif.rocks/kif495/api/
load_mods:
- 3d_armor
@@ -94,7 +96,7 @@ load_mods:
- advtrains_freight_train
- advtrains_interlocking
- advtrains_line_automation
- - advtrains_luaautomation
+ - advtrains_luaautomation_sync
- advtrains_railbus
- advtrains_signals_ks
- advtrains_train_industrial
@@ -266,5 +268,6 @@ load_mods:
- wieldview
disabled_mods:
- advtrains_itrainmap
+ - advtrains_luaautomation
- skinsdb
- snowdrift
diff --git a/kif_minetest_server/tasks/install_mods.yml b/kif_minetest_server/tasks/install_mods.yml
index a877fdd..069d529 100644
--- a/kif_minetest_server/tasks/install_mods.yml
+++ b/kif_minetest_server/tasks/install_mods.yml
@@ -20,6 +20,24 @@
when: mods_repo.changed
register: mods_repo
+- name: Create patched advtrains_luaautomation_sync
+ block:
+ - name: Copy original advtrains_luaautomation
+ ansible.builtin.copy:
+ src: "{{ minetest_base_dir }}/minetest_mods/advtrains/advtrains_luaautomation/"
+ dest: "{{ minetest_base_dir }}/minetest_mods/advtrains_luaautomation_sync/patched"
+ remote_src: true
+ mode: preserve
+
+ - name: Apply sync.patch
+ ansible.posix.patch:
+ src: "{{ minetest_base_dir }}/minetest_mods/advtrains_luaautomation_sync/sync.patch"
+ basedir: "{{ minetest_base_dir }}/minetest_mods/advtrains_luaautomation_sync/"
+ remote_src: true
+ strip: 0
+ become: true
+ when: '"advtrains_luaautomation_sync" in load_mods'
+
- name: Create cron job to automatically update mods
ansible.builtin.cron:
name: KIF minetest update mods
diff --git a/kif_minetest_server/templates/minetest.conf.j2 b/kif_minetest_server/templates/minetest.conf.j2
index c75fba6..6cf7e0a 100644
--- a/kif_minetest_server/templates/minetest.conf.j2
+++ b/kif_minetest_server/templates/minetest.conf.j2
@@ -67,3 +67,4 @@ moreblocks.stairsplus_in_creative_inventory = {{ moreblocks_stairsplus_in_creati
advtrains_wagon_load_range = {{ advtrains_wagon_load_range }}
advtrains_show_ids = {{ advtrains_show_ids }}
advtrains_lines_rwt_realtime = {{ advtrains_lines_rwt_realtime }}
+ak_announcer.api_endpoint = {{ ak_announcer_api_endpoint }}
diff --git a/testing.yml b/testing.yml
index d957237..92af3a7 100644
--- a/testing.yml
+++ b/testing.yml
@@ -17,7 +17,7 @@
- advtrains_assets
- advtrains_freight_train
- advtrains_interlocking
- - advtrains_line_automation
+ - advtrains_line_automation_sync
- advtrains_luaautomation
- advtrains_railbus
- advtrains_signals_ks
@@ -190,6 +190,7 @@
- wieldview
disabled_mods:
- advtrains_itrainmap
+ - advtrains_luaautomation
- skinsdb
- snowdrift
--
GitLab