diff --git a/group_vars/all/09_networks.yml b/group_vars/all/09_networks.yml index ee36108d..8b686942 100644 --- a/group_vars/all/09_networks.yml +++ b/group_vars/all/09_networks.yml @@ -88,7 +88,7 @@ defaults_networks: subnet: 192.168.103.96/28 web-svc-simpleicons: subnet: 192.168.103.112/28 - web-app-libretranslate: + web-svc-libretranslate: subnet: 192.168.103.128/28 web-app-pretix: subnet: 192.168.103.144/28 diff --git a/group_vars/all/09_ports.yml b/group_vars/all/09_ports.yml index 0930405d..ad3c5db6 100644 --- a/group_vars/all/09_ports.yml +++ b/group_vars/all/09_ports.yml @@ -66,7 +66,7 @@ ports: web-svc-collabora: 8042 web-app-mobilizon: 8043 web-svc-simpleicons: 8044 - web-app-libretranslate: 8045 + web-svc-libretranslate: 8045 web-app-pretix: 8046 web-app-mig: 8047 web-svc-logout: 8048 diff --git a/roles/web-app-coturn/vars/main.yml b/roles/web-app-coturn/vars/main.yml deleted file mode 100644 index fe189d24..00000000 --- a/roles/web-app-coturn/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -application_id: "web-app-coturn" -container_port: 3000 diff --git a/roles/web-app-nextcloud/config/main.yml b/roles/web-app-nextcloud/config/main.yml index 66578739..29596201 100644 --- a/roles/web-app-nextcloud/config/main.yml +++ b/roles/web-app-nextcloud/config/main.yml @@ -232,7 +232,7 @@ plugins: - oidc_login # Will be disabled spreed: # Nextcloud Spreed: offers video conferencing and chat functionalities (https://apps.nextcloud.com/apps/spreed) - enabled: false # @todo to activate it first implement web-app-coturn and activate it + enabled: false # @todo to activate it first implement web-svc-coturn and activate it tables: # Nextcloud tables: allows creation and editing of tables within the interface (https://apps.nextcloud.com/apps/tables) enabled: true diff --git a/roles/web-app-xmpp/vars/main.yml b/roles/web-app-xmpp/vars/main.yml deleted file mode 100644 index a867b7e4..00000000 --- a/roles/web-app-xmpp/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -application_id: web-app-xmpp \ No newline at end of file diff --git a/roles/web-app-coturn/README.md b/roles/web-svc-coturn/README.md similarity index 100% rename from roles/web-app-coturn/README.md rename to roles/web-svc-coturn/README.md diff --git a/roles/web-app-coturn/TODO.md b/roles/web-svc-coturn/TODO.md similarity index 100% rename from roles/web-app-coturn/TODO.md rename to roles/web-svc-coturn/TODO.md diff --git a/roles/web-app-coturn/config/main.yml.j2 b/roles/web-svc-coturn/config/main.yml.j2 similarity index 100% rename from roles/web-app-coturn/config/main.yml.j2 rename to roles/web-svc-coturn/config/main.yml.j2 diff --git a/roles/web-app-coturn/meta/main.yml b/roles/web-svc-coturn/meta/main.yml similarity index 97% rename from roles/web-app-coturn/meta/main.yml rename to roles/web-svc-coturn/meta/main.yml index 21a9707a..27d8a73c 100644 --- a/roles/web-app-coturn/meta/main.yml +++ b/roles/web-svc-coturn/meta/main.yml @@ -15,7 +15,7 @@ galaxy_info: - docker repository: "https://s.infinito.nexus/code" issue_tracker_url: "https://s.infinito.nexus/issues" - documentation: "https://s.infinito.nexus/code/tree/main/roles/web-app-coturn" + documentation: "https://s.infinito.nexus/code/tree/main/roles/web-svc-coturn" min_ansible_version: "2.9" platforms: - name: Any diff --git a/roles/web-app-coturn/tasks/main.yml b/roles/web-svc-coturn/tasks/main.yml similarity index 100% rename from roles/web-app-coturn/tasks/main.yml rename to roles/web-svc-coturn/tasks/main.yml diff --git a/roles/web-app-coturn/templates/docker-compose.yml.j2 b/roles/web-svc-coturn/templates/docker-compose.yml.j2 similarity index 100% rename from roles/web-app-coturn/templates/docker-compose.yml.j2 rename to roles/web-svc-coturn/templates/docker-compose.yml.j2 diff --git a/roles/web-app-coturn/templates/env.j2 b/roles/web-svc-coturn/templates/env.j2 similarity index 100% rename from roles/web-app-coturn/templates/env.j2 rename to roles/web-svc-coturn/templates/env.j2 diff --git a/roles/web-svc-coturn/vars/main.yml b/roles/web-svc-coturn/vars/main.yml new file mode 100644 index 00000000..4f168026 --- /dev/null +++ b/roles/web-svc-coturn/vars/main.yml @@ -0,0 +1,2 @@ +application_id: "web-svc-coturn" +container_port: 3000 diff --git a/roles/web-app-libretranslate/README.md b/roles/web-svc-libretranslate/README.md similarity index 100% rename from roles/web-app-libretranslate/README.md rename to roles/web-svc-libretranslate/README.md diff --git a/roles/web-app-libretranslate/config/main.yml b/roles/web-svc-libretranslate/config/main.yml similarity index 100% rename from roles/web-app-libretranslate/config/main.yml rename to roles/web-svc-libretranslate/config/main.yml diff --git a/roles/web-app-libretranslate/meta/main.yml b/roles/web-svc-libretranslate/meta/main.yml similarity index 100% rename from roles/web-app-libretranslate/meta/main.yml rename to roles/web-svc-libretranslate/meta/main.yml diff --git a/roles/web-app-libretranslate/schema/main.yml b/roles/web-svc-libretranslate/schema/main.yml similarity index 100% rename from roles/web-app-libretranslate/schema/main.yml rename to roles/web-svc-libretranslate/schema/main.yml diff --git a/roles/web-app-libretranslate/tasks/main.yml b/roles/web-svc-libretranslate/tasks/main.yml similarity index 100% rename from roles/web-app-libretranslate/tasks/main.yml rename to roles/web-svc-libretranslate/tasks/main.yml diff --git a/roles/web-app-libretranslate/templates/Dockerfile.j2 b/roles/web-svc-libretranslate/templates/Dockerfile.j2 similarity index 100% rename from roles/web-app-libretranslate/templates/Dockerfile.j2 rename to roles/web-svc-libretranslate/templates/Dockerfile.j2 diff --git a/roles/web-app-libretranslate/templates/docker-compose.yml.j2 b/roles/web-svc-libretranslate/templates/docker-compose.yml.j2 similarity index 100% rename from roles/web-app-libretranslate/templates/docker-compose.yml.j2 rename to roles/web-svc-libretranslate/templates/docker-compose.yml.j2 diff --git a/roles/web-app-libretranslate/templates/env.j2 b/roles/web-svc-libretranslate/templates/env.j2 similarity index 100% rename from roles/web-app-libretranslate/templates/env.j2 rename to roles/web-svc-libretranslate/templates/env.j2 diff --git a/roles/web-app-libretranslate/templates/javascript.js b/roles/web-svc-libretranslate/templates/javascript.js similarity index 100% rename from roles/web-app-libretranslate/templates/javascript.js rename to roles/web-svc-libretranslate/templates/javascript.js diff --git a/roles/web-app-libretranslate/vars/main.yml b/roles/web-svc-libretranslate/vars/main.yml similarity index 53% rename from roles/web-app-libretranslate/vars/main.yml rename to roles/web-svc-libretranslate/vars/main.yml index dd6424e6..bc714c83 100644 --- a/roles/web-app-libretranslate/vars/main.yml +++ b/roles/web-svc-libretranslate/vars/main.yml @@ -1,2 +1,2 @@ -application_id: web-app-libretranslate # ID of the application +application_id: web-svc-libretranslate # ID of the application database_type: 0 # Database type [postgres, mariadb] \ No newline at end of file diff --git a/roles/web-app-xmpp/README.md b/roles/web-svc-xmpp/README.md similarity index 100% rename from roles/web-app-xmpp/README.md rename to roles/web-svc-xmpp/README.md diff --git a/roles/web-app-xmpp/config/main.yml b/roles/web-svc-xmpp/config/main.yml similarity index 100% rename from roles/web-app-xmpp/config/main.yml rename to roles/web-svc-xmpp/config/main.yml diff --git a/roles/web-app-xmpp/meta/main.yml b/roles/web-svc-xmpp/meta/main.yml similarity index 97% rename from roles/web-app-xmpp/meta/main.yml rename to roles/web-svc-xmpp/meta/main.yml index 4a1873a7..a00dec1b 100644 --- a/roles/web-app-xmpp/meta/main.yml +++ b/roles/web-svc-xmpp/meta/main.yml @@ -14,7 +14,7 @@ galaxy_info: - stub repository: "https://s.infinito.nexus/code" issue_tracker_url: "https://s.infinito.nexus/issues" - documentation: "https://s.infinito.nexus/code/tree/main/roles/web-app-xmpp" + documentation: "https://s.infinito.nexus/code/tree/main/roles/web-svc-xmpp" min_ansible_version: "2.9" platforms: - name: Any diff --git a/roles/web-app-xmpp/templates/configuration.yml.j2 b/roles/web-svc-xmpp/templates/configuration.yml.j2 similarity index 100% rename from roles/web-app-xmpp/templates/configuration.yml.j2 rename to roles/web-svc-xmpp/templates/configuration.yml.j2 diff --git a/roles/web-svc-xmpp/vars/main.yml b/roles/web-svc-xmpp/vars/main.yml new file mode 100644 index 00000000..fa9a7671 --- /dev/null +++ b/roles/web-svc-xmpp/vars/main.yml @@ -0,0 +1 @@ +application_id: web-svc-xmpp \ No newline at end of file