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

Fix systemd services autostart problem with Docker 20.10

The Docker 19.04 -> 20.10 upgrade contains the following change
in `/usr/lib/systemd/system/docker.service`:

```
-BindsTo=containerd.service
-After=network-online.target firewalld.service containerd.service
+After=network-online.target firewalld.service containerd.service multi-user.target
-Requires=docker.socket
+Requires=docker.socket containerd.service
Wants=network-online.target
```

The `multi-user.target` requirement in `After` seems to be in conflict
with our `WantedBy=multi-user.target` and `After=docker.service` /
`Requires=docker.service` definitions, causing the following error on
startup for all of our systemd services:

> Job matrix-synapse.service/start deleted to break ordering cycle starting with multi-user.target/start

A workaround which appears to work is to add `DefaultDependencies=no`
to all of our services.
pull/749/head
Slavi Pantaleev 5 лет назад
Родитель
Сommit
d08b27784f
34 измененных файлов: 34 добавлений и 0 удалений
  1. +1
    -0
      roles/matrix-bot-matrix-reminder-bot/templates/systemd/matrix-bot-matrix-reminder-bot.service.j2
  2. +1
    -0
      roles/matrix-bridge-appservice-discord/templates/systemd/matrix-appservice-discord.service.j2
  3. +1
    -0
      roles/matrix-bridge-appservice-irc/templates/systemd/matrix-appservice-irc.service.j2
  4. +1
    -0
      roles/matrix-bridge-appservice-slack/templates/systemd/matrix-appservice-slack.service.j2
  5. +1
    -0
      roles/matrix-bridge-appservice-webhooks/templates/systemd/matrix-appservice-webhooks.service.j2
  6. +1
    -0
      roles/matrix-bridge-mautrix-facebook/templates/systemd/matrix-mautrix-facebook.service.j2
  7. +1
    -0
      roles/matrix-bridge-mautrix-hangouts/templates/systemd/matrix-mautrix-hangouts.service.j2
  8. +1
    -0
      roles/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2
  9. +1
    -0
      roles/matrix-bridge-mautrix-whatsapp/templates/systemd/matrix-mautrix-whatsapp.service.j2
  10. +1
    -0
      roles/matrix-bridge-mx-puppet-discord/templates/systemd/matrix-mx-puppet-discord.service.j2
  11. +1
    -0
      roles/matrix-bridge-mx-puppet-instagram/templates/systemd/matrix-mx-puppet-instagram.service.j2
  12. +1
    -0
      roles/matrix-bridge-mx-puppet-skype/templates/systemd/matrix-mx-puppet-skype.service.j2
  13. +1
    -0
      roles/matrix-bridge-mx-puppet-slack/templates/systemd/matrix-mx-puppet-slack.service.j2
  14. +1
    -0
      roles/matrix-bridge-mx-puppet-steam/templates/systemd/matrix-mx-puppet-steam.service.j2
  15. +1
    -0
      roles/matrix-bridge-mx-puppet-twitter/templates/systemd/matrix-mx-puppet-twitter.service.j2
  16. +1
    -0
      roles/matrix-bridge-sms/templates/systemd/matrix-sms-bridge.service.j2
  17. +1
    -0
      roles/matrix-client-element/templates/systemd/matrix-client-element.service.j2
  18. +1
    -0
      roles/matrix-corporal/templates/systemd/matrix-corporal.service.j2
  19. +1
    -0
      roles/matrix-coturn/templates/systemd/matrix-coturn.service.j2
  20. +1
    -0
      roles/matrix-dimension/templates/systemd/matrix-dimension.service.j2
  21. +1
    -0
      roles/matrix-dynamic-dns/templates/systemd/matrix-dynamic-dns.service.j2
  22. +1
    -0
      roles/matrix-email2matrix/templates/systemd/matrix-email2matrix.service.j2
  23. +1
    -0
      roles/matrix-jitsi/templates/jicofo/matrix-jitsi-jicofo.service.j2
  24. +1
    -0
      roles/matrix-jitsi/templates/jvb/matrix-jitsi-jvb.service.j2
  25. +1
    -0
      roles/matrix-jitsi/templates/prosody/matrix-jitsi-prosody.service.j2
  26. +1
    -0
      roles/matrix-jitsi/templates/web/matrix-jitsi-web.service.j2
  27. +1
    -0
      roles/matrix-ma1sd/templates/systemd/matrix-ma1sd.service.j2
  28. +1
    -0
      roles/matrix-mailer/templates/systemd/matrix-mailer.service.j2
  29. +1
    -0
      roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2
  30. +1
    -0
      roles/matrix-postgres/templates/systemd/matrix-postgres.service.j2
  31. +1
    -0
      roles/matrix-registration/templates/systemd/matrix-registration.service.j2
  32. +1
    -0
      roles/matrix-synapse-admin/templates/systemd/matrix-synapse-admin.service.j2
  33. +1
    -0
      roles/matrix-synapse/templates/goofys/systemd/matrix-goofys.service.j2
  34. +1
    -0
      roles/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2

+ 1
- 0
roles/matrix-bot-matrix-reminder-bot/templates/systemd/matrix-bot-matrix-reminder-bot.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_bot_matrix_reminder_bot_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-appservice-discord/templates/systemd/matrix-appservice-discord.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_appservice_discord_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-appservice-irc/templates/systemd/matrix-appservice-irc.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_appservice_irc_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-appservice-slack/templates/systemd/matrix-appservice-slack.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_appservice_slack_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-appservice-webhooks/templates/systemd/matrix-appservice-webhooks.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_appservice_webhooks_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-mautrix-facebook/templates/systemd/matrix-mautrix-facebook.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_mautrix_facebook_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-mautrix-hangouts/templates/systemd/matrix-mautrix-hangouts.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_mautrix_hangouts_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_mautrix_telegram_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-mautrix-whatsapp/templates/systemd/matrix-mautrix-whatsapp.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_mautrix_whatsapp_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-mx-puppet-discord/templates/systemd/matrix-mx-puppet-discord.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_mx_puppet_discord_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-mx-puppet-instagram/templates/systemd/matrix-mx-puppet-instagram.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_mx_puppet_instagram_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-mx-puppet-skype/templates/systemd/matrix-mx-puppet-skype.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_mx_puppet_skype_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-mx-puppet-slack/templates/systemd/matrix-mx-puppet-slack.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_mx_puppet_slack_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-mx-puppet-steam/templates/systemd/matrix-mx-puppet-steam.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_mx_puppet_steam_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-mx-puppet-twitter/templates/systemd/matrix-mx-puppet-twitter.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_mx_puppet_twitter_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-bridge-sms/templates/systemd/matrix-sms-bridge.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_sms_bridge_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-client-element/templates/systemd/matrix-client-element.service.j2 Просмотреть файл

@@ -5,6 +5,7 @@ Description=Matrix Element server
Requires={{ service }}
After={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-corporal/templates/systemd/matrix-corporal.service.j2 Просмотреть файл

@@ -5,6 +5,7 @@ Description=Matrix Corporal
Requires={{ service }}
After={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-coturn/templates/systemd/matrix-coturn.service.j2 Просмотреть файл

@@ -5,6 +5,7 @@ Description=Matrix Coturn server
Requires={{ service }}
After={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-dimension/templates/systemd/matrix-dimension.service.j2 Просмотреть файл

@@ -3,6 +3,7 @@
Description=Matrix Dimension
After=docker.service
Requires=docker.service
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-dynamic-dns/templates/systemd/matrix-dynamic-dns.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_dynamic_dns_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-email2matrix/templates/systemd/matrix-email2matrix.service.j2 Просмотреть файл

@@ -3,6 +3,7 @@
Description=Email2Matrix
After=docker.service
Requires=docker.service
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-jitsi/templates/jicofo/matrix-jitsi-jicofo.service.j2 Просмотреть файл

@@ -5,6 +5,7 @@ Description=Matrix jitsi-jicofo server
Requires={{ service }}
After={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-jitsi/templates/jvb/matrix-jitsi-jvb.service.j2 Просмотреть файл

@@ -5,6 +5,7 @@ Description=Matrix jitsi-jvb server
Requires={{ service }}
After={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-jitsi/templates/prosody/matrix-jitsi-prosody.service.j2 Просмотреть файл

@@ -5,6 +5,7 @@ Description=Matrix jitsi-prosody server
Requires={{ service }}
After={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-jitsi/templates/web/matrix-jitsi-web.service.j2 Просмотреть файл

@@ -5,6 +5,7 @@ Description=Matrix jitsi-web server
Requires={{ service }}
After={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-ma1sd/templates/systemd/matrix-ma1sd.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_ma1sd_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-mailer/templates/systemd/matrix-mailer.service.j2 Просмотреть файл

@@ -3,6 +3,7 @@
Description=Matrix mailer
After=docker.service
Requires=docker.service
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_nginx_proxy_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-postgres/templates/systemd/matrix-postgres.service.j2 Просмотреть файл

@@ -3,6 +3,7 @@
Description=Matrix Postgres server
After=docker.service
Requires=docker.service
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-registration/templates/systemd/matrix-registration.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_registration_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-synapse-admin/templates/systemd/matrix-synapse-admin.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_synapse_admin_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-synapse/templates/goofys/systemd/matrix-goofys.service.j2 Просмотреть файл

@@ -3,6 +3,7 @@
Description=Matrix Goofys media store
After=docker.service
Requires=docker.service
DefaultDependencies=no

[Service]
Type=simple


+ 1
- 0
roles/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2 Просмотреть файл

@@ -8,6 +8,7 @@ After={{ service }}
{% for service in matrix_synapse_systemd_wanted_services_list %}
Wants={{ service }}
{% endfor %}
DefaultDependencies=no

[Service]
Type=simple


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