Просмотр исходного кода

Add .service suffix to systemd units list

We'll be adding `.timer` units later on, so it's good to be
more explicit.
pull/801/head
Slavi Pantaleev 5 лет назад
Родитель
Сommit
05ca9357a8
32 измененных файлов: 33 добавлений и 33 удалений
  1. +1
    -1
      roles/matrix-bot-matrix-reminder-bot/tasks/init.yml
  2. +1
    -1
      roles/matrix-bridge-appservice-discord/tasks/init.yml
  3. +1
    -1
      roles/matrix-bridge-appservice-irc/tasks/init.yml
  4. +1
    -1
      roles/matrix-bridge-appservice-slack/tasks/init.yml
  5. +1
    -1
      roles/matrix-bridge-appservice-webhooks/tasks/init.yml
  6. +1
    -1
      roles/matrix-bridge-mautrix-facebook/tasks/init.yml
  7. +1
    -1
      roles/matrix-bridge-mautrix-hangouts/tasks/init.yml
  8. +1
    -1
      roles/matrix-bridge-mautrix-signal/tasks/init.yml
  9. +1
    -1
      roles/matrix-bridge-mautrix-telegram/tasks/init.yml
  10. +1
    -1
      roles/matrix-bridge-mautrix-whatsapp/tasks/init.yml
  11. +1
    -1
      roles/matrix-bridge-mx-puppet-discord/tasks/init.yml
  12. +1
    -1
      roles/matrix-bridge-mx-puppet-instagram/tasks/init.yml
  13. +1
    -1
      roles/matrix-bridge-mx-puppet-skype/tasks/init.yml
  14. +1
    -1
      roles/matrix-bridge-mx-puppet-slack/tasks/init.yml
  15. +1
    -1
      roles/matrix-bridge-mx-puppet-steam/tasks/init.yml
  16. +1
    -1
      roles/matrix-bridge-mx-puppet-twitter/tasks/init.yml
  17. +1
    -1
      roles/matrix-bridge-sms/tasks/init.yml
  18. +1
    -1
      roles/matrix-client-element/tasks/init.yml
  19. +1
    -1
      roles/matrix-common-after/tasks/start.yml
  20. +1
    -1
      roles/matrix-corporal/tasks/init.yml
  21. +1
    -1
      roles/matrix-coturn/tasks/init.yml
  22. +1
    -1
      roles/matrix-dimension/tasks/init.yml
  23. +1
    -1
      roles/matrix-dynamic-dns/tasks/init.yml
  24. +1
    -1
      roles/matrix-email2matrix/tasks/init.yml
  25. +1
    -1
      roles/matrix-jitsi/tasks/init.yml
  26. +1
    -1
      roles/matrix-ma1sd/tasks/init.yml
  27. +1
    -1
      roles/matrix-mailer/tasks/init.yml
  28. +1
    -1
      roles/matrix-nginx-proxy/tasks/init.yml
  29. +1
    -1
      roles/matrix-postgres/tasks/init.yml
  30. +1
    -1
      roles/matrix-registration/tasks/init.yml
  31. +1
    -1
      roles/matrix-synapse-admin/tasks/init.yml
  32. +2
    -2
      roles/matrix-synapse/tasks/init.yml

+ 1
- 1
roles/matrix-bot-matrix-reminder-bot/tasks/init.yml Просмотреть файл

@@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-bot-matrix-reminder-bot'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-bot-matrix-reminder-bot.service'] }}"
when: matrix_bot_matrix_reminder_bot_enabled|bool

+ 1
- 1
roles/matrix-bridge-appservice-discord/tasks/init.yml Просмотреть файл

@@ -7,7 +7,7 @@
when: "matrix_appservice_discord_enabled and matrix_synapse_role_executed|default(False)"

- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-appservice-discord'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-appservice-discord.service'] }}"
when: matrix_appservice_discord_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-appservice-irc/tasks/init.yml Просмотреть файл

@@ -7,7 +7,7 @@
when: "matrix_appservice_irc_enabled|bool and matrix_synapse_role_executed|default(False)"

- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-appservice-irc'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-appservice-irc.service'] }}"
when: matrix_appservice_irc_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-appservice-slack/tasks/init.yml Просмотреть файл

@@ -7,7 +7,7 @@
when: "matrix_synapse_role_executed|default(False)"

- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-appservice-slack'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-appservice-slack.service'] }}"
when: matrix_appservice_slack_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-appservice-webhooks/tasks/init.yml Просмотреть файл

@@ -7,7 +7,7 @@
when: "matrix_synapse_role_executed|default(False)"

- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-appservice-webhooks'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-appservice-webhooks.service'] }}"
when: matrix_appservice_webhooks_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mautrix-facebook/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-facebook'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-facebook.service'] }}"
when: matrix_mautrix_facebook_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mautrix-hangouts/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-hangouts'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-hangouts.service'] }}"
when: matrix_mautrix_hangouts_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mautrix-signal/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-signal', 'matrix-mautrix-signal-daemon'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-signal.service', 'matrix-mautrix-signal-daemon.service'] }}"
when: matrix_mautrix_signal_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mautrix-telegram/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-telegram'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-telegram.service'] }}"
when: matrix_mautrix_telegram_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mautrix-whatsapp/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-whatsapp'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mautrix-whatsapp.service'] }}"
when: matrix_mautrix_whatsapp_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mx-puppet-discord/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-discord'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-discord.service'] }}"
when: matrix_mx_puppet_discord_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mx-puppet-instagram/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-instagram'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-instagram.service'] }}"
when: matrix_mx_puppet_instagram_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mx-puppet-skype/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-skype'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-skype.service'] }}"
when: matrix_mx_puppet_skype_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mx-puppet-slack/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-slack'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-slack.service'] }}"
when: matrix_mx_puppet_slack_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mx-puppet-steam/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-steam'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-steam.service'] }}"
when: matrix_mx_puppet_steam_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-mx-puppet-twitter/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-twitter'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mx-puppet-twitter.service'] }}"
when: matrix_mx_puppet_twitter_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-bridge-sms/tasks/init.yml Просмотреть файл

@@ -7,7 +7,7 @@
when: "matrix_sms_bridge_enabled and matrix_synapse_role_executed|default(False)"

- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-sms-bridge'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-sms-bridge.service'] }}"
when: matrix_sms_bridge_enabled|bool

# If the matrix-synapse role is not used, these variables may not exist.


+ 1
- 1
roles/matrix-client-element/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-client-element'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-client-element.service'] }}"
when: matrix_client_element_enabled|bool

# ansible lower than 2.8, does not support docker_image build parameters


+ 1
- 1
roles/matrix-common-after/tasks/start.yml Просмотреть файл

@@ -46,7 +46,7 @@
Try running `systemctl status {{ item }}` and `journalctl -fu {{ item }}` on the server to investigate.
with_items: "{{ matrix_systemd_services_list }}"
when:
- "ansible_facts.services[item + '.service']|default(none) is none or ansible_facts.services[item + '.service'].state != 'running'"
- "ansible_facts.services[item]|default(none) is none or ansible_facts.services[item].state != 'running'"
when: " ansible_distribution != 'Archlinux'"

- block:


+ 1
- 1
roles/matrix-corporal/tasks/init.yml Просмотреть файл

@@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-corporal'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-corporal.service'] }}"
when: matrix_corporal_enabled|bool

+ 1
- 1
roles/matrix-coturn/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-coturn'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-coturn.service'] }}"
when: matrix_coturn_enabled|bool

# ansible lower than 2.8, does not support docker_image build parameters


+ 1
- 1
roles/matrix-dimension/tasks/init.yml Просмотреть файл

@@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-dimension'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-dimension.service'] }}"
when: matrix_dimension_enabled|bool

+ 1
- 1
roles/matrix-dynamic-dns/tasks/init.yml Просмотреть файл

@@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-dynamic-dns'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-dynamic-dns.service'] }}"
when: "matrix_dynamic_dns_enabled|bool"

+ 1
- 1
roles/matrix-email2matrix/tasks/init.yml Просмотреть файл

@@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-email2matrix'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-email2matrix.service'] }}"
when: matrix_email2matrix_enabled|bool

+ 1
- 1
roles/matrix-jitsi/tasks/init.yml Просмотреть файл

@@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-jitsi-web', 'matrix-jitsi-prosody', 'matrix-jitsi-jicofo', 'matrix-jitsi-jvb'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-jitsi-web.service', 'matrix-jitsi-prosody.service', 'matrix-jitsi-jicofo.service', 'matrix-jitsi-jvb.service'] }}"
when: matrix_jitsi_enabled|bool

+ 1
- 1
roles/matrix-ma1sd/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-ma1sd'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-ma1sd.service'] }}"
when: matrix_ma1sd_enabled|bool

# ansible lower than 2.8, does not support docker_image build parameters


+ 1
- 1
roles/matrix-mailer/tasks/init.yml Просмотреть файл

@@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mailer'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-mailer.service'] }}"
when: matrix_mailer_enabled|bool

+ 1
- 1
roles/matrix-nginx-proxy/tasks/init.yml Просмотреть файл

@@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-nginx-proxy'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-nginx-proxy.service'] }}"
when: matrix_nginx_proxy_enabled|bool

+ 1
- 1
roles/matrix-postgres/tasks/init.yml Просмотреть файл

@@ -1,3 +1,3 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-postgres'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-postgres.service'] }}"
when: matrix_postgres_enabled|bool

+ 1
- 1
roles/matrix-registration/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-registration'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-registration.service'] }}"
when: matrix_registration_enabled|bool

- block:


+ 1
- 1
roles/matrix-synapse-admin/tasks/init.yml Просмотреть файл

@@ -1,5 +1,5 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-synapse-admin'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-synapse-admin.service'] }}"
when: matrix_synapse_admin_enabled|bool

- block:


+ 2
- 2
roles/matrix-synapse/tasks/init.yml Просмотреть файл

@@ -1,9 +1,9 @@
- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-synapse'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-synapse.service'] }}"
when: matrix_synapse_enabled|bool

- set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-goofys'] }}"
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-goofys.service'] }}"
when: matrix_s3_media_store_enabled|bool

# ansible lower than 2.8, does not support docker_image build parameters


Загрузка…
Отмена
Сохранить