Merge branch 'main' into feature/ansible-lint

Author: onokatio

README.md

@@ -13,7 +13,7 @@
 | `work`     | `130.158.78.7`   | CentOS 7     | `172.16.0.11`    |                |                           | SSH Bastion, on `kvm-serv`  |
 | `mail`     | `130.158.78.1`   | CentOS 7     | `172.16.0.1`     | `172.16.254.1` | `serv1`                   | Postfix, Dovecot, Mailman   |
 | `node0`    | `130.158.42.5`   | Ubuntu 24.04 | `172.16.0.232`   | `172.16.0.211` | `mail-skylake`, `docker2` | DNS                         |
-| `node1`    |                  | Ubuntu 24.04 | `172.16.0.230`   | `172.16.0.231` |                           |                             |
+| `node1`    |                  | Ubuntu 24.04 | `172.16.0.230`   | `172.16.0.231` |                           | Web                         |
 
 ## 手オペ対象
 

ansible/group_vars/all.yml

@@ -1,16 +1,10 @@
 users:
-  cfp_summary:
-    uid: 2000
   traefik:
     uid: 2001
   openldap:
     uid: 106
     gid: 105
 
-ports:
-  cfp_summary_db: 10000
-  cfp_summary: 10001
-
 authoritative_dns:
   internal_ip: 172.16.0.232
 

ansible/roles/firewall/templates/sshd.conf.j2

@@ -3,4 +3,4 @@ enabled  = true
 bantime  = 30m
 findtime = 10m
 maxretry = 5
-ignoreip = {{ firewall.allow_ip.tsukuba }} {{ firewall.allow_ip.omni }} {{ firewall.allow_ip.internal }}
+ignoreip = {{ firewall_allow_ip.tsukuba }} {{ firewall_allow_ip.omni }} {{ firewall_allow_ip.internal }}

ansible/roles/firewall/vars/main.yml

@@ -1,5 +1,4 @@
-firewall:
-  allow_ip:
+firewall_allow_ip:
     tsukuba: 130.158.0.0/16
     omni: 163.220.252.0/23
     internal: 172.16.0.232

ansible/roles/http/files/traefik/dynamic.yaml

@@ -29,5 +29,3 @@ certificatesResolvers:
 providers:
   docker:
     exposedByDefault: false
-  file:
-    filename: /etc/traefik/dynamic.yaml

ansible/roles/http/files/traefik/traefik.yaml

@@ -17,10 +17,7 @@
     - { ip: "172.16.0.232", hostname: "node0.lab.hpcs.cs.tsukuba.ac.jp" }
     - { ip: "172.16.0.230", hostname: "node0.lab.hpcs.cs.tsukuba.ac.jp" }
     - { ip: "172.16.0.224", hostname: "gw-ipmi.lab.hpcs.cs.tsukuba.ac.jp" }
-    - {
-        ip: "172.16.0.210",
-        hostname: "kvm-serv-ipmi.lab.hpcs.cs.tsukuba.ac.jp",
-      }
+    - { ip: "172.16.0.210", hostname: "kvm-serv-ipmi.lab.hpcs.cs.tsukuba.ac.jp"}
     - { ip: "172.16.254.1", hostname: "mail-ipmi.lab.hpcs.cs.tsukuba.ac.jp" }
     - { ip: "172.16.0.211", hostname: "node0-ipmi.lab.hpcs.cs.tsukuba.ac.jp" }
     - { ip: "172.16.0.231", hostname: "node1-ipmi.lab.hpcs.cs.tsukuba.ac.jp" }

ansible/roles/static_hosts/tasks/main.yml

@@ -68,49 +68,6 @@
     group: root
     mode: "0755"
 
-- name: Copy route to cfp-summary-server
-  ansible.builtin.copy:
-    src: cfp-summary-server.yaml
-    dest: /etc/traefik/dynamic/cfp-summary-server.yaml
-    owner: root
-    group: root
-    mode: "0644"
-  notify: Restart docker compose
-
-- name: Create /etc/cfp_summary
-  ansible.builtin.file:
-    path: /etc/cfp-summary
-    state: directory
-    owner: root
-    group: root
-    mode: "0755"
-  notify: Restart docker compose
-
-- name: Copy app.json
-  ansible.builtin.template:
-    src: app.json
-    dest: /etc/cfp-summary/app.json
-    owner: root
-    group: root
-    mode: "0644"
-  notify: Restart docker compose
-
-- name: Copy db.json
-  ansible.builtin.template:
-    src: db.json
-    dest: /etc/cfp-summary
-    owner: root
-    group: root
-    mode: "0640"
-
-- name: Create /var/lib/cfp-summary-db
-  ansible.builtin.file:
-    path: /var/lib/cfp-summary-db
-    state: directory
-    owner: root
-    group: root
-    mode: "0700"
-
 - name: Copy docker-compose.yml
   ansible.builtin.template:
     src: docker-compose.yml