smart reload

.gitignore

@@ -109,3 +109,4 @@ dist
 /result/
 
 *.retry
+*-setconf.conf.j2

ansible/protocols/wg/configure.yaml

@@ -22,3 +22,13 @@
     name: 'wg-quick@{{conn.name}}'
     state: started
     enabled: yes
+  register: 'wg_enable_result'
+- name: config for setconf
+  template:
+    src: wg-setconf.conf.j2
+    dest: '/tmp/{{conn.name}}-setconf.conf'
+  register: 'wg_setconf_result'
+  when: 'not wg_enable_result.changed'
+- name: setconf
+  shell: 'wg setconf {{conn.name}} /tmp/{{conn.name}}-setconf.conf'
+  when: 'not wg_enable_result.changed and wg_setconf_result.changed'

ansible/protocols/wgfrp/configure.yaml

-- name: stop，测试用。
-  systemd:
-    name: 'wg-quick@{{conn.name}}'
-    state: stopped
-- name: conf
-  template:
-    src: wgfrp.conf.j2
-    dest: '/etc/wireguard/{{conn.name}}.conf'
-- name: enable
-  systemd:
-    name: 'wg-quick@{{conn.name}}'
-    state: started
-    enabled: yes
+# frpc
 - name: frpc template
   template:
     src: 'frpc.ini.j2'
     dest: '/etc/frp/{{conn.name}}.ini'
   when: 'conn.frpType == "frpc"'
+  register: frpc_config_result
 - name: start frpc
   systemd:
     name: 'frpc@{{conn.name}}'
-    state: restarted
+    state: started
     enabled: true
+  register: frpc_launch_result
   when: 'conn.frpType == "frpc"'
+- name: reload frpc
+  systemd:
+    name: 'frpc@{{conn.name}}'
+    state: reloaded
+  when: 'conn.frpType == "frpc" and frpc_config_result.changed and not frpc_launch_result.changed'
+
+# frps
 - name: register frps
   set_fact:
     frps_needed: 1
   when: 'conn.frpType == "frps"'
+
+# wg
+- name: wg conf
+  template:
+    src: wgfrp.conf.j2
+    dest: '/etc/wireguard/{{conn.name}}.conf'
+- name: enable
+  systemd:
+    name: 'wg-quick@{{conn.name}}'
+    state: started
+    enabled: yes
+  register: wg_enable_result
+- name: config for setconf
+  template:
+    src: wgfrp-setconf.conf.j2
+    dest: '/tmp/{{conn.name}}-setconf.conf'
+  register: 'wg_setconf_result'
+  when: 'not wg_enable_result.changed'
+- name: setconf
+  shell: 'wg setconf {{conn.name}} /tmp/{{conn.name}}-setconf.conf'
+  when: 'not wg_enable_result.changed and wg_setconf_result.changed'

ansible/protocols/wgfrp/frps.yaml

@@ -2,8 +2,15 @@
   template:
     src: 'frps.ini.j2'
     dest: '/etc/frp/frps.ini'
+  register: frps_config_result
 - name: start frps
   systemd:
     name: 'frps'
-    state: restarted
+    state: started
     enabled: true
+  register: frps_launch_result
+- name: start frps
+  systemd:
+    name: 'frps'
+    state: reloaded
+  when: 'frps_config_result.changed and not frps_launch_result.changed'

update.sh

@@ -6,7 +6,31 @@ echo "现在开放测试的节点：south.mycard.moe,yuzurisa.mycard.moe,hk-hkg-
 
 read -p '确认无误后按回车继续'
 
+
 mkdir -p result
 npm run inventory
+
 cd ansible || exit
+
+sed -r -e 's/Address/#Address/g' \
+                -e 's/Fwmark/#Fwmark/g' \
+                -e 's/Table/#Table/g' \
+                -e 's/DNS/#DNS/g' \
+                -e 's/MTU/#MTU/g' \
+                -e 's/PostUp/#PostUp/g' \
+                -e 's/PostDown/#PostDown/g' \
+                -e 's/PreUp/#PreUp/g' \
+                -e 's/PreDown/#PreDown/g' \
+                ./protocols/wg/wg.conf.j2 > ./protocols/wg/wg-setconf.conf.j2
+sed -r -e 's/Address/#Address/g' \
+                -e 's/Fwmark/#Fwmark/g' \
+                -e 's/Table/#Table/g' \
+                -e 's/DNS/#DNS/g' \
+                -e 's/MTU/#MTU/g' \
+                -e 's/PostUp/#PostUp/g' \
+                -e 's/PostDown/#PostDown/g' \
+                -e 's/PreUp/#PreUp/g' \
+                -e 's/PreDown/#PreDown/g' \
+                ./protocols/wgfrp/wgfrp.conf.j2 > ./protocols/wgfrp/wgfrp-setconf.conf.j2
+
 ansible-playbook -i ../result/inventory.yaml "$@" configure.yaml