Merge branch 'master' into babeld

ansible/configure.yaml

@@ -97,6 +97,17 @@
       with_items: '{{ connections }}'
       when: "not noUpdateLinks and (not onlyUpdateLink or item.name == onlyUpdateLink) and item.protocol != 'null'"
 # end
+    - name: disable bug self-link
+      become: true
+      ignore_errors: true
+      systemd:
+        name: 'wg-quick@{{item}}'
+        state: stopped
+        enabled: false
+        masked: true
+      with_items:
+        - mc-{{inventory_hostname_short}}
+        - mci{{inventory_hostname_short}}
     - name: services conf
       copy:
         content: '{{dockerServices | to_yaml}}'

ansible/migrate-chnroute.yaml

 - hosts: wg
   remote_user: root
   tasks:
-    - name: migrate
+    - name: load vars
+      include_vars:
+        file: '../result/{{item}}.yaml'
+      with_items:
+        - global-vars
+        - vars-{{inventory_hostname_short}}
+    - name: post scripts
+      template:
+        src: scripts/{{item}}.sh.j2
+        dest: '{{ansible_user_dir}}/nextgen-network/scripts/{{item}}.sh'
+        mode: a+x
+      with_items:
+        - postup
+        - predown
+        - global-postup
+        - utility
+        - switch-rules-up
+        - switch-rules-down
+        - ocserv-postup
+        - ocserv-predown
+    - name: chnroute
       become: true
       shell: |
         ipset restore -f {{ansible_user_dir}}/nextgen-network/ipsets/chnrouter.ipset || true