Ajout renderd-cyclosm.vm sur osm36

osm-fr · Jan 15, 2024 · 42d8e9f · 42d8e9f
1 parent 566d5dc
commit 42d8e9f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/host_vars/renderd-cyclosm.vm.openstreetmap.fr/proxmox b/host_vars/renderd-cyclosm.vm.openstreetmap.fr/proxmox
@@ -0,0 +1,14 @@
+proxmox_var:
+  host: osm36.openstreetmap.fr
+  cpus: 16
+  disk: 100
+  docker: 0
+  hostname: renderd-cyclosm.vm.openstreetmap.fr
+  ipv6: 2001:67c:1740:9031::205
+  kvm: 0
+  netif: {"net0": "name=eth0,bridge=vmbr0,ip=10.1.0.205/24,gw=10.0.0.36", "net1": "name=eth1,bridge=vmbr1,ip6=2001:67c:1740:9031::205/80,gw6=2001:67c:1740:9031::1"}
+  memory: 65536
+  ostemplate: debian-12-standard_12.2-1_amd64.tar.zst
+  storage: "local-zfs"
+  swap: 2048
+  vmid: 205
diff --git a/host_vars/renderd-cyclosm.vm.openstreetmap.fr/renderd b/host_vars/renderd-cyclosm.vm.openstreetmap.fr/renderd
@@ -0,0 +1 @@
+renderd_serveralias: dev.cyclosm.openstreetmap.fr
diff --git a/host_vars/renderd-cyclosm.vm.openstreetmap.fr/users_root b/host_vars/renderd-cyclosm.vm.openstreetmap.fr/users_root
@@ -0,0 +1,2 @@
+users_root:
+  - phyks
diff --git a/hosts b/hosts
@@ -97,6 +97,7 @@ pleinair.vm.openstreetmap.fr vm_host=osm27.openstreetmap.fr # osm201.openstreetm
 bzh202.vm.openstreetmap.fr vm_host=osm27.openstreetmap.fr # osm202.openstreetmap.fr
 postgres-free.vm.openstreetmap.fr vm_host=osm12.openstreetmap.fr # osm203.openstreetmap.fr
 adopte-une-commune.vm.openstreetmap.fr vm_host=osm12.openstreetmap.fr # osm204.openstreetmap.fr
+renderd-cyclosm.vm.openstreetmap.fr vm_host=osm36.openstreetmap.fr # osm205.openstreetmap.fr
 osm211.openstreetmap.fr vm_host=osm29.openstreetmap.fr
 osm212.openstreetmap.fr vm_host=osm30.openstreetmap.fr
 osm213.openstreetmap.fr vm_host=osm31.openstreetmap.fr
@@ -282,6 +283,7 @@ osm32.openstreetmap.fr proxmox_backup_host=true
 osm13.openstreetmap.fr renderd_layers=true
 osm166.openstreetmap.fr renderd_cyclosm=true
 renderd.th3.vm.openstreetmap.fr renderd_layers=true
+renderd-cyclosm.vm.openstreetmap.fr renderd_cyclosm=true
 bzh202.vm.openstreetmap.fr renderd_bzh=true
 
 [wireguard]
@@ -454,6 +456,7 @@ pic4review.vm.openstreetmap.fr
 osm11.openstreetmap.fr
 osm165.openstreetmap.fr
 osm166.openstreetmap.fr
+renderd-cyclosm.vm.openstreetmap.fr renderd_cyclosm=true
 
 [pyrog]
 mobilizon.vm.openstreetmap.fr

diff --git a/roles/renderd/tasks/cyclosm.yml b/roles/renderd/tasks/cyclosm.yml
@@ -24,15 +24,11 @@
     state: present
     filename: nodesource
 
-- name: install nodejs packages
-  apt:
-    pkg: nodejs
-    state: latest
-
 - name: install packages
   apt:
     pkg:
       - nodejs
+      - npm
     state: latest
 
 - name: npm install

diff --git a/roles/renderd/tasks/main.yml b/roles/renderd/tasks/main.yml
@@ -121,5 +121,5 @@
   when: renderd_layers
 
 # style cyclosm
-- import_tasks: cyclosm.yml
+- include_tasks: cyclosm.yml
   when: renderd_cyclosm
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		renderd_serveralias: dev.cyclosm.openstreetmap.fr