Settings: Settings Migrator - Replace {{ user }} with {{ user.name }}

desimaniac · desimaniac · commit c14d0b521193 · 2019-05-27T15:16:05.000-05:00
diff --git a/roles/settings/tasks/main.yml b/roles/settings/tasks/main.yml
@@ -38,6 +38,8 @@
   include_tasks: "subtasks/settings_migrator.yml"
   with_items:
     - "accounts.yml"
+    - "settings.yml"
+    - "adv_settings.yml"
     - "backup_config.yml"
 
 - name: Initialize empty lists and vars
diff --git a/roles/settings/tasks/subtasks/settings_migrator.yml b/roles/settings/tasks/subtasks/settings_migrator.yml
@@ -28,14 +28,21 @@
     become_user: "{{ cloudbox_yml.stat.pw_name }}"
     when: file_is_encrypted
 
+  - name: Settings Migrator | Global Migrations for all files
+    block:
+
+    # Replace {{ user }} with {{ user.name }}
+    - name: Settings Migrator | Global | Migration 01
+      include_tasks: "settings_migrator/global/migration_01.yml"
+
   - name: Settings Migrator | Migrations for 'accounts.yml'
     block:
 
-    #  Move 'user,passwd,domain,email' to 'user' key
+    # Move 'user,passwd,domain,email' to 'user' key
     - name: Settings Migrator | accounts.yml | Migration 01
       include_tasks: "settings_migrator/accounts_yml/migration_01.yml"
 
-    #  Move 'cloudflare_api_token' to 'cloudflare' key
+    # Move 'cloudflare_api_token' to 'cloudflare' key
     - name: Settings Migrator | accounts.yml | Migration 02
       include_tasks: "settings_migrator/accounts_yml/migration_02.yml"
 
diff --git a/roles/settings/tasks/subtasks/settings_migrator/global/migration_01.yml b/roles/settings/tasks/subtasks/settings_migrator/global/migration_01.yml
@@ -0,0 +1,22 @@
+#########################################################################
+# Title:         Settings Migrator | Global | Migration 01              #
+# Author(s):     desimaniac                                             #
+# URL:           https://github.com/cloudbox/cloudbox                   #
+# --                                                                    #
+#         Part of the Cloudbox project: https://cloudbox.works          #
+#########################################################################
+#                   GNU General Public License v3.0                     #
+#########################################################################
+---
+- name: Settings Migrator | Global | Migration 01 |
+    Replace '{% raw -%}{{ user }}{%- endraw %}' with '{% raw -%}{{ user.name }}{%- endraw %}'
+  replace:
+    path: "{{ playbook_dir }}/{{ item }}"
+    regexp: '{% raw -%}{{\s*user\s*}}{%- endraw %}'
+    replace: '{% raw -%}{{ user.name }}{%- endraw %}'
+    owner: "{{ cloudbox_yml.stat.uid }}"
+    group: "{{ cloudbox_yml.stat.gid }}"
+    mode: 0664
+
+- name: Settings Migrator | Global | Migration 01 | Re-import Variables
+  include_vars: "{{ playbook_dir }}/{{ item }}"
