diff --git a/README.md b/README.md index 8a20274..4ebc550 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# Ansible collection +# uumas.general This includes some general roles for personal use diff --git a/docs/vars.md b/docs/vars.md index 0ec98ce..2d5c3c8 100644 --- a/docs/vars.md +++ b/docs/vars.md @@ -2,8 +2,6 @@ These variables are required by some roles. Example values included. ``` -timezone: 'Europe/Helsinki' -domain: 'example.tld' email: 'admin@domain.tld' ``` diff --git a/galaxy.yml b/galaxy.yml index 452f734..67eac37 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -2,7 +2,7 @@ namespace: uumas name: general -version: 0.2.0 +version: 0.3.0 readme: README.md authors: - uumas diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml deleted file mode 100644 index a8bed6d..0000000 --- a/roles/docker/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- name: Install dependencies - apt: - name: - - apt-transport-https - - ca-certificates - - curl - - gnupg - - lsb-release - update_cache: yes - -- name: Add docker repo signing key - apt_key: - id: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88' - url: 'https://download.docker.com/linux/debian/gpg' -- name: Add docker repo - apt_repository: - repo: "deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable" - filename: 'docker' - mode: '644' - -- name: Install docker - apt: - name: - - docker-ce - - docker-ce-cli - - containerd.io - - python-docker diff --git a/roles/jitsi_docker/meta/main.yml b/roles/jitsi_docker/meta/main.yml deleted file mode 100644 index c39100e..0000000 --- a/roles/jitsi_docker/meta/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -dependencies: - - docker - - caddy diff --git a/roles/jitsi_docker/tasks/main.yml b/roles/jitsi_docker/tasks/main.yml deleted file mode 100644 index e3569ad..0000000 --- a/roles/jitsi_docker/tasks/main.yml +++ /dev/null @@ -1,124 +0,0 @@ ---- - -- name: Jitsi meet docker network - docker_network: - name: meet.jitsi - -- name: Jitsi meet web - docker_container: - name: 'jitsi_meet_web' - image: 'jitsi/web:latest' - pull: yes - container_default_behavior: no_defaults - published_ports: - - "{{ localhost_ip }}:{{ ports.jitsi_http }}:80" - env: - DISABLE_HTTPS: '1' - PUBLIC_URL: "{{ jitsi_external_url }}" - TZ: "{{ timezone }}" - ENABLE_PREJOIN_PAGE: '1' - ENABLE_REQUIRE_DISPLAY_NAME: '1' - ENABLE_NOISY_MIC_DETECTION: '0' - ENABLE_RECORDING: '0' - JICOFO_AUTH_USER: focus - XMPP_BOSH_URL_BASE: 'http://xmpp.meet.jitsi:5280' - XMPP_DOMAIN: meet.jitsi - XMPP_AUTH_DOMAIN: auth.meet.jitsi - XMPP_MUC_DOMAIN: muc.meet.jitsi - restart_policy: always - networks: - - name: meet.jitsi - aliases: - - meet.jitsi - -- name: Jitsi meet prosody - docker_container: - name: 'jitsi_meet_prosody' - image: 'jitsi/prosody:latest' - pull: yes - container_default_behavior: no_defaults - env: - PUBLIC_URL: "{{ jitsi_external_url }}" - TZ: "{{ timezone }}" - ENABLE_LOBBY: '1' - JICOFO_COMPONENT_SECRET: "{{ jitsi_pw.jicofo_component }}" - JICOFO_AUTH_USER: focus - JICOFO_AUTH_PASSWORD: "{{ jitsi_pw.jicofo_auth }}" - JVB_AUTH_USER: jvb - JVB_AUTH_PASSWORD: "{{ jitsi_pw.jvb_auth }}" - XMPP_DOMAIN: meet.jitsi - XMPP_AUTH_DOMAIN: auth.meet.jitsi - XMPP_INTERNAL_MUC_DOMAIN: internal-muc.meet.jitsi - XMPP_MUC_DOMAIN: muc.meet.jitsi - restart_policy: always - exposed_ports: - - '5222' - - '5347' - networks: - - name: meet.jitsi - aliases: - - xmpp.meet.jitsi - -- name: Jitsi meet jicofo - docker_container: - name: 'jitsi_meet_jicofo' - image: 'jitsi/jicofo:latest' - pull: yes - container_default_behavior: no_defaults - env: - TZ: "{{ timezone }}" - JVB_BREWERY_MUC: jvbbrewery - JICOFO_COMPONENT_SECRET: "{{ jitsi_pw.jicofo_component }}" - JICOFO_AUTH_USER: focus - JICOFO_AUTH_PASSWORD: "{{ jitsi_pw.jicofo_auth }}" - XMPP_DOMAIN: meet.jitsi - XMPP_AUTH_DOMAIN: auth.meet.jitsi - XMPP_MUC_DOMAIN: muc.meet.jitsi - XMPP_INTERNAL_MUC_DOMAIN: internal-muc.meet.jitsi - XMPP_SERVER: xmpp.meet.jitsi - ENABLE_RECORDING: '0' - restart_policy: always - networks: - - name: meet.jitsi - aliases: - - meet.jitsi - -- name: Jitsi meet video bridge - docker_container: - name: 'jitsi_meet_jvb' - image: 'jitsi/jvb:latest' - pull: yes - container_default_behavior: no_defaults - published_ports: - - "{{ ports.jitsi_jvb | default(10000) }}:10000/udp" - - "{{ ports.jitsi_jvb_tcp | default(4443) }}:4443" - env: - PUBLIC_URL: "{{ jitsi_external_url }}" - TZ: "{{ timezone }}" - JVB_PORT: '10000' - JVB_TCP_PORT: '4443' - JVB_TCP_HARVESTER_DISABLED: 'false' - JVB_BREWERY_MUC: jvbbrewery - JVB_STUN_SERVERS: 'meet-jit-si-turnrelay.jitsi.net:443' - JVB_AUTH_USER: jvb - JVB_AUTH_PASSWORD: "{{ jitsi_pw.jvb_auth }}" - XMPP_AUTH_DOMAIN: auth.meet.jitsi - XMPP_INTERNAL_MUC_DOMAIN: internal-muc.meet.jitsi - XMPP_SERVER: xmpp.meet.jitsi - restart_policy: always - networks: - - name: meet.jitsi - aliases: - - meet.jitsi - -- name: Add caddy reverse proxy config - blockinfile: - path: /etc/caddy/Caddyfile - marker: "# {mark} ANSIBLE MANAGED BLOCK jitsi" - block: | - {{ jitsi_external_url }} { - reverse_proxy http://{{ localhost_ip }}:{{ ports.jitsi_http }} - } - validate: 'caddy validate --config %s --adapter caddyfile' - backup: yes - notify: reload caddy