Anglicization of variable names

webapps/jitsimeet/defaults/main.yml

@@ -1,18 +1,18 @@
 ---
 # defaults file for main vars
 
-version: "stable-8319" # 7 mars 2023
+version: "stable-8319" # 7 March 2023
 version_old: "stable-8252" # used by jitsimeet/tasks/upgrade.yml
-utilisateur_unix: "jitsi_user362"
-repertoires_config: "['~/.jitsi-meet-cfg/web', '~/.jitsi-meet-cfg/web/letsencrypt', '~/.jitsi-meet-cfg/transcripts', '~/.jitsi-meet-cfg/prosody', '~/.jitsi-meet-cfg/prosody/config', '~/.jitsi-meet-cfg/prosody/prosody-plugins-custom', '~/.jitsi-meet-cfg/jicofo', '~/.jitsi-meet-cfg/jvb', '~/.jitsi-meet-cfg/jigasi', '~/.jitsi-meet-cfg/jibri']"
+unix_user: "jitsi_user362"
+config_dirs: "['~/.jitsi-meet-cfg/web', '~/.jitsi-meet-cfg/web/letsencrypt', '~/.jitsi-meet-cfg/transcripts', '~/.jitsi-meet-cfg/prosody', '~/.jitsi-meet-cfg/prosody/config', '~/.jitsi-meet-cfg/prosody/prosody-plugins-custom', '~/.jitsi-meet-cfg/jicofo', '~/.jitsi-meet-cfg/jvb', '~/.jitsi-meet-cfg/jigasi', '~/.jitsi-meet-cfg/jibri']"
 
 # Variables for the Jitsi Meet docker-compose .env du projet 
-port_http: "80"
-port_https: "443"
-fuseau_horaire: "UTC"
-url_publique: "https://jitsi.mondomaine.net"
+http_port: "80"
+https_port: "443"
+time_zone: "UTC"
+public_url: "https://jitsi.mydomain.net"
 letsencrypt: "1"
-letsencrypt_domaine: "jitsi.mondomaine.net"
-letsencrypt_courriel: "un_nom@mondomaine.net"
-redir_http: "1"
+letsencrypt_domain: "jitsi.mydomain.net"
+letsencrypt_email: "somename@mmydomain.net"
+http_redir: "1"
 hsts: "1"

webapps/jitsimeet/tasks/main.yml

@@ -3,50 +3,50 @@
 
 - name: "Add unix user for docker/docker-compose"
   user:
-    name: "{{ utilisateur_unix }}"
+    name: "{{ unix_user }}"
     groups: docker
-    home: "/var/opt/{{ utilisateur_unix }}"
+    home: "/var/opt/{{ unix_user }}"
     shell: /bin/bash
 #    umask: "0022" requires ansible-core 2.12
     append: yes
 
 #- name: "Set the value of umask for unix user"
 #  lineinfile:
-#    path: "/var/opt/{{ utilisateur_unix }}/.profile"
+#    path: "/var/opt/{{ unix_user }}/.profile"
 #    regexp: '^#umask'
 #    line: umask 022
     
 - name: "Download and uncompress Docker Compose project for Jitsi Meet"
   unarchive: 
     src: "https://github.com/jitsi/docker-jitsi-meet/archive/refs/tags/{{ version }}.tar.gz"
-    dest: "/var/opt/{{ utilisateur_unix }}"
+    dest: "/var/opt/{{ unix_user }}"
     remote_src: yes
-  become_user: "{{ utilisateur_unix }}"
+  become_user: "{{ unix_user }}"
 
 - name: "Template .env for Jitsi Meet's Docker Compose project"
   template:
     src: "env.j2"
-    dest: "/var/opt/{{ utilisateur_unix }}/docker-jitsi-meet-{{ version }}/.env"
-    owner: "{{ utilisateur_unix }}"
-    group: "{{ utilisateur_unix }}"
+    dest: "/var/opt/{{ unix_user }}/docker-jitsi-meet-{{ version }}/.env"
+    owner: "{{ unix_user }}"
+    group: "{{ unix_user }}"
     mode: '644'
 
 - name: "(Re)generate strong passwords using dev provided script"
   command: ./gen-passwords.sh
   args:
-    chdir: "/var/opt/{{ utilisateur_unix }}/docker-jitsi-meet-{{ version }}/"
-  become_user: "{{ utilisateur_unix }}"
+    chdir: "/var/opt/{{ unix_user }}/docker-jitsi-meet-{{ version }}/"
+  become_user: "{{ unix_user }}"
 
 - name: "Add required config directories" 
   file:
     path: "{{ item }}"
     state: directory
     mode: '755'
-  loop: "{{ repertoires_config }}"
-  become_user: "{{ utilisateur_unix }}"
+  loop: "{{ config_dirs }}"
+  become_user: "{{ unix_user }}"
 
 - name: "Start services via docker-compose"
   docker_compose:
-    project_src: "/var/opt/{{ utilisateur_unix }}/docker-jitsi-meet-{{ version }}"
+    project_src: "/var/opt/{{ unix_user }}/docker-jitsi-meet-{{ version }}"
     state: present
-  become_user: "{{ utilisateur_unix }}"
+  become_user: "{{ unix_user }}"

webapps/jitsimeet/tasks/upgrade.yml

@@ -3,33 +3,33 @@
 
 - name: "Stop running services via docker-compose"
   docker_compose:
-    project_src: "/var/opt/{{ utilisateur_unix }}/docker-jitsi-meet-{{ version_old }}"
+    project_src: "/var/opt/{{ unix_user }}/docker-jitsi-meet-{{ version_old }}"
     state: absent
-  become_user: "{{ utilisateur_unix }}"
+  become_user: "{{ unix_user }}"
 
 - name: "Download and uncompress new Docker Compose project for Jitsi Meet"
   unarchive: 
     src: "https://github.com/jitsi/docker-jitsi-meet/archive/refs/tags/{{ version }}.tar.gz"
-    dest: "/var/opt/{{ utilisateur_unix }}"
+    dest: "/var/opt/{{ unix_user }}"
     remote_src: yes
-  become_user: "{{ utilisateur_unix }}"
+  become_user: "{{ unix_user }}"
 
 - name: "Template .env for Jitsi Meet's Docker Compose project"
   template:
     src: "env.j2"
-    dest: "/var/opt/{{ utilisateur_unix }}/docker-jitsi-meet-{{ version }}/.env"
-    owner: "{{ utilisateur_unix }}"
-    group: "{{ utilisateur_unix }}"
-    mode: 0644
+    dest: "/var/opt/{{ unix_user }}/docker-jitsi-meet-{{ version }}/.env"
+    owner: "{{ unix_user }}"
+    group: "{{ unix_user }}"
+    mode: '644'
 
 - name: "(Re)generate strong passwords using dev provided script"
   command: ./gen-passwords.sh
   args:
-    chdir: "/var/opt/{{ utilisateur_unix }}/docker-jitsi-meet-{{ version }}/"
-  become_user: "{{ utilisateur_unix }}"
+    chdir: "/var/opt/{{ unix_user }}/docker-jitsi-meet-{{ version }}/"
+  become_user: "{{ unix_user }}"
   
 - name: "Start services via docker-compose"
   docker_compose:
-    project_src: "/var/opt/{{ utilisateur_unix }}/docker-jitsi-meet-{{ version }}"
+    project_src: "/var/opt/{{ unix_user }}/docker-jitsi-meet-{{ version }}"
     state: present
-  become_user: "{{ utilisateur_unix }}"
+  become_user: "{{ unix_user }}"

webapps/jitsimeet/templates/env.j2

@@ -33,16 +33,16 @@ JIBRI_XMPP_PASSWORD=
 CONFIG=~/.jitsi-meet-cfg
 
 # Exposed HTTP port
-HTTP_PORT={{ port_http }}
+HTTP_PORT={{ http_port }}
 
 # Exposed HTTPS port
-HTTPS_PORT={{ port_https }}
+HTTPS_PORT={{ https_port }}
 
 # System time zone
-TZ={{ fuseau_horaire }}
+TZ={{ time_zone }}
 
 # Public URL for the web service (required)
-PUBLIC_URL={{ url_publique }}
+PUBLIC_URL={{ public_url }}
 
 # IP address of the Docker host
 # See the "Running behind NAT or on a LAN environment" section in the Handbook:
@@ -75,10 +75,10 @@ PUBLIC_URL={{ url_publique }}
 ENABLE_LETSENCRYPT={{ letsencrypt }}
 
 # Domain for which to generate the certificate
-LETSENCRYPT_DOMAIN={{ letsencrypt_domaine }}
+LETSENCRYPT_DOMAIN={{ letsencrypt_domain }}
 
 # E-Mail for receiving important account notifications (mandatory)
-LETSENCRYPT_EMAIL={{ letsencrypt_courriel }}
+LETSENCRYPT_EMAIL={{ letsencrypt_email }}
 
 # Use the staging server (for avoiding rate limits while testing)
 #LETSENCRYPT_USE_STAGING=1
@@ -363,7 +363,7 @@ JIBRI_LOGS_DIR=/config/logs
 
 # Redirect HTTP traffic to HTTPS
 # Necessary for Let's Encrypt, relies on standard HTTPS port (443)
-ENABLE_HTTP_REDIRECT={{ redir_http }}
+ENABLE_HTTP_REDIRECT={{ http_redir }}
 
 # Send a `strict-transport-security` header to force browsers to use
 # a secure and trusted connection. Recommended for production use.