tcp reload

.gitignore

@@ -115,5 +115,6 @@ dist
 *.retry
 wgfrp-setconf.conf.j2
 certs
+babeld-reload.conf.j2
 
 __pycache__

ansible/configure.yaml

@@ -108,8 +108,13 @@
       template:
         src: babeld.conf.j2
         dest: '{{ansible_user_dir}}/nextgen-network/services/babeld.conf'
-      notify: restart_babeld
-#      when: not noBird
+      # notify: reload_babeld
+      when: not noBird
+    - name: babeld reload conf
+      template:
+        src: babeld-reload.conf.j2
+        dest: /tmp/babeld-reload.conf
+      notify: reload_babeld
     - name: frps conf
       template:
         src: protocols/wgfrp/frps.ini.j2
@@ -137,6 +142,21 @@
         enabled: true
         masked: false
       when: systemBird
+    - name: systemd babeld conf
+      become: true
+      template:
+        src: babeld.conf.j2
+        dest: '/etc/babeld.conf'
+      # notify: reload_babeld
+      when: systemBird
+    - name: enable systemd babeld
+      become: true
+      systemd:
+        name: babeld
+        state: started
+        enabled: true
+        masked: false
+      when: systemBird
   handlers:
     - name: reload_switch_rules
       become: true
@@ -148,13 +168,8 @@
         services:
           - bird
       when: not noBird
-    - name: restart_babeld
-      docker_compose:
-        project_src: '{{ansible_user_dir}}/nextgen-network/services'
-        restarted: true
-        services:
-          - babeld
-      # when: not noBird
+    - name: reload_babeld
+      shell: cat /tmp/babeld-reload.conf | nc ::1 33123
     - name: restart_frps
       docker_compose:
         project_src: '{{ansible_user_dir}}/nextgen-network/services'

ansible/install.yaml

@@ -11,3 +11,25 @@
         - fatedier/frps:v0.34.2
         - fatedier/frpc:v0.34.2
         - git-registry.mycard.moe/nanahira/docker-bird
+    - name: unstable source
+      become: true
+      copy:
+        content: | 
+          deb http://mirrors.tuna.tsinghua.edu.cn/debian unstable main contrib non-free
+        dest: /etc/apt/sources.list.d/unstable.list
+      when: systemBird and ansible_distribution == 'Debian'
+    - name: unstable pref 90
+      become: true
+      copy:
+        content: | 
+          Package: *
+          Pin: release a=unstable
+          Pin-Priority: 90
+        dest: /etc/apt/preferences.d/limit-unstable
+      when: systemBird and ansible_distribution == 'Debian'
+    - name: install packages for systemd things
+      become: true
+      apt:
+        update_cache: true
+        name: babeld,bird2
+      when: systemBird

update.sh

@@ -28,6 +28,9 @@ _strip_wg_conf() {
 # _strip_wg_conf ./protocols/wg/wg.conf.j2 ./protocols/wg/wg-setconf.conf.j2
 _strip_wg_conf ./protocols/wgfrp/wgfrp.conf.j2 ./protocols/wgfrp/wgfrp-setconf.conf.j2
 
+cat babeld.conf.j2 > babeld-reload.conf.j2
+echo 'quit' >> babeld-reload.conf.j2
+
 ansible-playbook -i ../result/inventory.yaml "$@" configure.yaml
 cd ..