From 4e53e448d99d266b03a218c7e330e162a09251af Mon Sep 17 00:00:00 2001
From: Valeria Fadeeva <valeria.fadeeva.me@gmail.com>
Date: Sat, 11 Jan 2025 22:11:08 +0500
Subject: [PATCH] Update

---
 settings.conf                                     |  7 +++++++
 settings_offline.conf                             |  7 +++++++
 settings_online.conf                              |  7 +++++++
 ...lprocess_copy_dnscrypt_blocklist_chrooted.conf | 15 +++++++++++++++
 ...rocess_copy_dnscrypt_resolv_conf_chrooted.conf |  4 ++--
 ...rocess_generate_dnscrypt_cert_dont_chroot.conf |  4 ++--
 6 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 src/modules/shellprocess/shellprocess_copy_dnscrypt_blocklist_chrooted.conf

diff --git a/settings.conf b/settings.conf
index 8f0d9a3..dfa8593 100644
--- a/settings.conf
+++ b/settings.conf
@@ -79,6 +79,12 @@ instances:
   module:   shellprocess
   config:   shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
 
+#  - shellprocess@copy_dnscrypt_blocklist_chrooted
+- id:       copy_dnscrypt_blocklist_chrooted
+  module:   shellprocess
+  config:   shellprocess_copy_dnscrypt_blocklist_chrooted.conf
+
+
 sequence:
 - show:
   - welcome@offline
@@ -114,6 +120,7 @@ sequence:
   - services-systemd
   - shellprocess@generate_dnscrypt_cert_dont_chroot
   - shellprocess@copy_dnscrypt_resolv_conf_chrooted
+  - shellprocess@copy_dnscrypt_blocklist_chrooted
   - shellprocess@copy_refind_theme_chrooted
   - shellprocess@install_intel_drivers_chrooted
   - shellprocess@remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted
diff --git a/settings_offline.conf b/settings_offline.conf
index 8f0d9a3..dfa8593 100644
--- a/settings_offline.conf
+++ b/settings_offline.conf
@@ -79,6 +79,12 @@ instances:
   module:   shellprocess
   config:   shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
 
+#  - shellprocess@copy_dnscrypt_blocklist_chrooted
+- id:       copy_dnscrypt_blocklist_chrooted
+  module:   shellprocess
+  config:   shellprocess_copy_dnscrypt_blocklist_chrooted.conf
+
+
 sequence:
 - show:
   - welcome@offline
@@ -114,6 +120,7 @@ sequence:
   - services-systemd
   - shellprocess@generate_dnscrypt_cert_dont_chroot
   - shellprocess@copy_dnscrypt_resolv_conf_chrooted
+  - shellprocess@copy_dnscrypt_blocklist_chrooted
   - shellprocess@copy_refind_theme_chrooted
   - shellprocess@install_intel_drivers_chrooted
   - shellprocess@remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted
diff --git a/settings_online.conf b/settings_online.conf
index 562ff72..c3faeb4 100644
--- a/settings_online.conf
+++ b/settings_online.conf
@@ -80,6 +80,12 @@ instances:
   module:   shellprocess
   config:   shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
 
+#  - shellprocess@copy_dnscrypt_blocklist_chrooted
+- id:       copy_dnscrypt_blocklist_chrooted
+  module:   shellprocess
+  config:   shellprocess_copy_dnscrypt_blocklist_chrooted.conf
+
+
 sequence:
 - show:
   - welcome@online
@@ -116,6 +122,7 @@ sequence:
   - services-systemd
   - shellprocess@generate_dnscrypt_cert_dont_chroot
   - shellprocess@copy_dnscrypt_resolv_conf_chrooted
+  - shellprocess@copy_dnscrypt_blocklist_chrooted
   - shellprocess@copy_refind_theme_chrooted
   - shellprocess@install_nvidia_drivers_chrooted
   - shellprocess@install_intel_drivers_chrooted
diff --git a/src/modules/shellprocess/shellprocess_copy_dnscrypt_blocklist_chrooted.conf b/src/modules/shellprocess/shellprocess_copy_dnscrypt_blocklist_chrooted.conf
new file mode 100644
index 0000000..dd03a25
--- /dev/null
+++ b/src/modules/shellprocess/shellprocess_copy_dnscrypt_blocklist_chrooted.conf
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+
+---
+
+i18n:
+  name: "Copying configure file domains-blocklist for DNSCrypt"
+  name[ru]: "Копирование настроек domains-blocklist для DNSCrypt"
+
+dontChroot: false
+
+timeout: 180
+
+script:
+  - "-cp -vf /usr/share/dnscrypt-proxy/utils/generate-domains-blocklist/after_install_rename_to_domains-blocklist.conf /usr/share/dnscrypt-proxy/utils/generate-domains-blocklist/domains-blocklist.conf"
diff --git a/src/modules/shellprocess/shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf b/src/modules/shellprocess/shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
index 407f5ff..08151bf 100644
--- a/src/modules/shellprocess/shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
+++ b/src/modules/shellprocess/shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
@@ -4,8 +4,8 @@
 ---
 
 i18n:
-  name: "Copying the theme for the boot menu"
-  name[ru]: "Копирование темы оформления для загрузочного меню"
+  name: "Copying configure file resolv.conf for DNSCrypt"
+  name[ru]: "Копирование настроек resolv.conf для DNSCrypt"
 
 dontChroot: false
 
diff --git a/src/modules/shellprocess/shellprocess_generate_dnscrypt_cert_dont_chroot.conf b/src/modules/shellprocess/shellprocess_generate_dnscrypt_cert_dont_chroot.conf
index 713292c..2475a6b 100644
--- a/src/modules/shellprocess/shellprocess_generate_dnscrypt_cert_dont_chroot.conf
+++ b/src/modules/shellprocess/shellprocess_generate_dnscrypt_cert_dont_chroot.conf
@@ -4,8 +4,8 @@
 ---
 
 i18n:
-  name: "Generate dnscrypt cert"
-  name[ru]: "Создание сертификата для dnscrypt"
+  name: "Generate DNSCrypt cert"
+  name[ru]: "Создание сертификата для DNSCrypt"
 
 dontChroot: true