the gwgroup

ansible/bird.conf.j2

-# MyCard bird
-# Force change in 12.14
-
-log stderr all;
-router id {{address}};
-
-protocol device {}
-
-protocol kernel {
-  learn;
-  ipv4 {
-    import where net = 0.0.0.0/0;
-    export where net != 0.0.0.0/0;
-  };
-  #ipv6 { export all; };
-}
-
-
-{% for plan in routePlans %}
-ipv4 table {{plan.name}};
-{% if plan.addressesString %}
-protocol pipe {
-  table master4;
-  peer table {{plan.name}};
-  export where ospf_router_id ~ {{plan.addressesString}};
-}
-{% endif %}
-protocol kernel {
-  ipv4 {
-    table {{plan.name}};
-    export all;
-  };
-  persist;
-  kernel table {{plan.destMark}};
-}
-{% endfor %}

ansible/configure.yaml

@@ -113,18 +113,24 @@
         content: '{{dockerServices | to_yaml}}'
         dest: '{{ansible_user_dir}}/nextgen-network/services/docker-compose.yml'
       when: not noBird
-    - name: bird conf
-      template:
-        src: bird.conf.j2
-        dest: '{{ansible_user_dir}}/nextgen-network/services/bird.conf'
-      notify: restart_bird
-      when: not noBird
+    #- name: bird conf
+    #  template:
+    #    src: bird.conf.j2
+    #    dest: '{{ansible_user_dir}}/nextgen-network/services/bird.conf'
+    #  notify: restart_bird
+    #  when: not noBird
     - name: babeld conf
       template:
         src: babeld.conf.j2
         dest: '{{ansible_user_dir}}/nextgen-network/services/babeld.conf'
       #notify: restart_babeld
       when: not noBird
+    - name: monitor route plans
+      template:
+        src: route-plans.j2
+        dest: '{{ansible_user_dir}}/nextgen-network/services/route-plans'
+      notify: restart_monitor
+      when: not noBird
     - name: babeld reload conf
       template:
         src: babeld-reload.conf.j2
@@ -142,56 +148,56 @@
         remove_orphans: true
         # pull: true
       when: not noBird
-    - name: systemd bird
-      become: true
-      template:
-        src: bird.conf.j2
-        dest: '/etc/bird/bird.conf'
-      notify: restart_bird_systemd
-      when: systemBird
-    - name: enable systemd bird
-      become: true
-      systemd:
-        name: bird
-        state: started
-        enabled: true
-        masked: false
-      when: systemBird
-    - name: systemd babeld conf
-      become: true
-      template:
-        src: babeld.conf.j2
-        dest: '/etc/babeld.conf'
-      #notify: restart_babeld_systemd
-      when: systemBird
-    - name: enable systemd babeld
-      become: true
-      systemd:
-        name: babeld
-        state: started
-        enabled: true
-        masked: false
-      when: systemBird
+    #- name: systemd bird
+    #  become: true
+    #  template:
+    #    src: bird.conf.j2
+    #    dest: '/etc/bird/bird.conf'
+    #  notify: restart_bird_systemd
+    #  when: systemBird
+    #- name: enable systemd bird
+    #  become: true
+    #  systemd:
+    #    name: bird
+    #    state: started
+    #    enabled: true
+    #    masked: false
+    #  when: systemBird
+    #- name: systemd babeld conf
+    #  become: true
+    #  template:
+    #    src: babeld.conf.j2
+    #    dest: '/etc/babeld.conf'
+    #  #notify: restart_babeld_systemd
+    #  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
       shell: '{{ansible_user_dir}}/nextgen-network/scripts/switch-rules-down.sh ; {{ansible_user_dir}}/nextgen-network/scripts/switch-rules-up.sh'
-    - name: restart_bird
+    - name: restart_babeld # ocserv would be always restarted whenever key changes..
       docker_compose:
         project_src: '{{ansible_user_dir}}/nextgen-network/services'
         restarted: true
         services:
-          - bird
+          - babeld
       when: not noBird
-    - name: restart_babeld # ocserv would be always restarted whenever key changes..
+    - name: reload_babeld
+      shell: cat /tmp/babeld-reload.conf | timeout 1 nc ::1 33123 || true
+    - name: restart_monitor
       docker_compose:
         project_src: '{{ansible_user_dir}}/nextgen-network/services'
         restarted: true
         services:
-          - babeld
+          - gateways-monitor
       when: not noBird
-    - name: reload_babeld
-      shell: cat /tmp/babeld-reload.conf | timeout 1 nc ::1 33123 || true
     - name: restart_frps
       docker_compose:
         project_src: '{{ansible_user_dir}}/nextgen-network/services'
@@ -222,17 +228,17 @@
           - openconnect-{{item.name}}
       with_items: '{{connections}}'
       when: 'item.protocol == "oc" and item.ocType == "client" and not noBird and not item.noUpdate'
-    - name: restart_bird_systemd
-      become: true
-      systemd:
-        name: bird
-        state: restarted
-    - name: restart_babeld_systemd
-      become: true
-      systemd:
-        name: babeld
-        state: restarted
-      when: systemBird
+    #- name: restart_bird_systemd
+    #  become: true
+    #  systemd:
+    #    name: bird
+    #    state: restarted
+    #- name: restart_babeld_systemd
+    #  become: true
+    #  systemd:
+    #    name: babeld
+    #    state: restarted
+    #  when: systemBird
     - name: reload_chnroute
       become: true
       shell: |

ansible/install.yaml

@@ -8,9 +8,9 @@
         name: '{{item}}'
         source: pull
       with_items:
-        - fatedier/frps:v0.34.2
-        - fatedier/frpc:v0.34.2
-        - git-registry.mycard.moe/nanahira/docker-bird
+        #- fatedier/frps:v0.34.2
+        #- fatedier/frpc:v0.34.2
+        - git-registry.mycard.moe/railgun/gateways-monitor
         - git-registry.mycard.moe/railgun/babeld
         - git-registry.mycard.moe/nanahira/docker-ocserv
         - git-registry.mycard.moe/railgun/openconnect

src/inventory.ts

@@ -156,7 +156,7 @@ class InventoryBuilder {
     if (!addresses.length) {
       return null;
     }
-    return `[ ${addresses.join(", ")} ]`;
+    return addresses.join(" ");
   }
   getAddressesFromGatewayGroup(gatewayGroup: GatewayGroup, hosts: any[]) {
     const locationPrefixes = gatewayGroup.locationPrefix.split(",");
@@ -209,12 +209,12 @@ class InventoryBuilder {
     host.dockerServices = {
       version: '2.4',
       services: {
-        bird: {
+        'gateways-monitor': {
           restart: 'always',
-          image: 'git-registry.mycard.moe/nanahira/docker-bird',
+          image: 'git-registry.mycard.moe/railgun/gateways-monitor',
           network_mode: 'host',
           cap_add: ['NET_ADMIN'],
-          volumes: ['./bird.conf:/etc/bird/bird.conf:ro']
+          volumes: ['./route-plans:/usr/src/app/route-plans:ro']
         },
         babeld: {
           restart: 'always',