Updated Tails checks in network hook and ansible validate role

freedomofpress · Feb 13, 2024 · 4ed7752 · 4ed7752
1 parent 74c04ec
commit 4ed7752
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/install_files/ansible-base/roles/tails-config/files/securedrop_init.py b/install_files/ansible-base/roles/tails-config/files/securedrop_init.py
@@ -122,7 +122,7 @@
 
 # in Tails 4, reload gnome-shell desktop icons extension to update with changes above
 with open("/etc/os-release") as f:
-    is_tails = "TAILS_PRODUCT_NAME" in f.read()
+    is_tails = 'NAME="Tails"' in f.read()
 if is_tails:
     subprocess.call(["gnome-shell-extension-tool", "-r", "desktop-icons@csoriano"], env=env)
 
@@ -165,7 +165,7 @@
     for line in file:
         try:
             k, v = line.strip().split("=")
-            if k == "TAILS_VERSION_ID":
+            if k == "VERSION":
                 tails_current_version = v.strip('"').split(".")
         except ValueError:
             continue

diff --git a/install_files/ansible-base/roles/validate/tasks/validate_tails_environment.yml b/install_files/ansible-base/roles/validate/tasks/validate_tails_environment.yml
@@ -2,7 +2,7 @@
   find:
     name: "/etc"
     patterns: "os-release"
-    contains: "^TAILS_PRODUCT_NAME="
+    contains: "^NAME=\"Tails\""
   register: tails_os_string
 
 - name: Confirm host OS is Tails.