summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2018-04-03 17:38:20 +0100
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2018-04-03 18:05:06 +0100
commit2cd12c28d84a77f5c5d3fc42638de38c47596792 (patch)
treecbcab88f7a1c14c9bd17fbbdd564ddb45394d071
parentc0d114fb9d9ff0912d5ea362f6d0fa4485366b3f (diff)
downloadinfrastructure-2cd12c28d84a77f5c5d3fc42638de38c47596792.tar.gz
Stop using default.target in servicespedro/default_target_workaround
Use multi-user.target instead. There is a bug in systemd that makes it ignore the services in default.target.wants folder: https://github.com/systemd/systemd/issues/6334 This issue is still present in fedora 27, so this is the best workaround for now.
-rw-r--r--baserock_ostree/etc/systemd/system/ostree-update-summary-cache.service2
-rw-r--r--baserock_ostree/etc/systemd/system/ostree-update-summary-cache.timer2
-rw-r--r--baserock_ostree/etc/systemd/system/ostree-update-summary-releases.service2
-rw-r--r--baserock_ostree/etc/systemd/system/ostree-update-summary-releases.timer2
-rw-r--r--baserock_webserver/etc/systemd/system/generate-docs.baserock.org.service2
-rw-r--r--baserock_webserver/etc/systemd/system/generate-docs.baserock.org.timer2
-rw-r--r--baserock_webserver/gitlab-bot/gitlab-bst-bot.service.in2
-rw-r--r--baserock_webserver/hastebin/haste-server.service.in2
-rw-r--r--baserock_webserver/instance-gitlab-bot-config.yml1
-rw-r--r--baserock_webserver/instance-hastebin-config.yml1
10 files changed, 10 insertions, 8 deletions
diff --git a/baserock_ostree/etc/systemd/system/ostree-update-summary-cache.service b/baserock_ostree/etc/systemd/system/ostree-update-summary-cache.service
index 70f4e708..c48916f8 100644
--- a/baserock_ostree/etc/systemd/system/ostree-update-summary-cache.service
+++ b/baserock_ostree/etc/systemd/system/ostree-update-summary-cache.service
@@ -8,4 +8,4 @@ User = ostree
Group = ostree
[Install]
-WantedBy=default.target
+WantedBy=multi-user.target
diff --git a/baserock_ostree/etc/systemd/system/ostree-update-summary-cache.timer b/baserock_ostree/etc/systemd/system/ostree-update-summary-cache.timer
index 3696b028..8914f875 100644
--- a/baserock_ostree/etc/systemd/system/ostree-update-summary-cache.timer
+++ b/baserock_ostree/etc/systemd/system/ostree-update-summary-cache.timer
@@ -5,4 +5,4 @@ Description = Update OSTree summary files for 'cache' repo
OnUnitActiveSec = 5min
[Install]
-WantedBy = default.target
+WantedBy = multi-user.target
diff --git a/baserock_ostree/etc/systemd/system/ostree-update-summary-releases.service b/baserock_ostree/etc/systemd/system/ostree-update-summary-releases.service
index fdb557f1..a0ed58a9 100644
--- a/baserock_ostree/etc/systemd/system/ostree-update-summary-releases.service
+++ b/baserock_ostree/etc/systemd/system/ostree-update-summary-releases.service
@@ -8,4 +8,4 @@ User = ostree-releases
Group = ostree-releases
[Install]
-WantedBy=default.target
+WantedBy=multi-user.target
diff --git a/baserock_ostree/etc/systemd/system/ostree-update-summary-releases.timer b/baserock_ostree/etc/systemd/system/ostree-update-summary-releases.timer
index eea6dd5a..702ec789 100644
--- a/baserock_ostree/etc/systemd/system/ostree-update-summary-releases.timer
+++ b/baserock_ostree/etc/systemd/system/ostree-update-summary-releases.timer
@@ -5,4 +5,4 @@ Description = Update OSTree summary files for 'releases' repo
OnUnitActiveSec = 5min
[Install]
-WantedBy = default.target
+WantedBy = multi-user.target
diff --git a/baserock_webserver/etc/systemd/system/generate-docs.baserock.org.service b/baserock_webserver/etc/systemd/system/generate-docs.baserock.org.service
index 93ec6e7f..3b205d46 100644
--- a/baserock_webserver/etc/systemd/system/generate-docs.baserock.org.service
+++ b/baserock_webserver/etc/systemd/system/generate-docs.baserock.org.service
@@ -8,4 +8,4 @@ User = fedora
Group = fedora
[Install]
-WantedBy=default.target
+WantedBy=multi-user.target
diff --git a/baserock_webserver/etc/systemd/system/generate-docs.baserock.org.timer b/baserock_webserver/etc/systemd/system/generate-docs.baserock.org.timer
index d78f677b..29f8d51a 100644
--- a/baserock_webserver/etc/systemd/system/generate-docs.baserock.org.timer
+++ b/baserock_webserver/etc/systemd/system/generate-docs.baserock.org.timer
@@ -5,4 +5,4 @@ Description = Generate docs.baserock.org content
OnUnitActiveSec = 10min
[Install]
-WantedBy = default.target
+WantedBy = multi-user.target
diff --git a/baserock_webserver/gitlab-bot/gitlab-bst-bot.service.in b/baserock_webserver/gitlab-bot/gitlab-bst-bot.service.in
index cc3f5af4..a2374795 100644
--- a/baserock_webserver/gitlab-bot/gitlab-bst-bot.service.in
+++ b/baserock_webserver/gitlab-bot/gitlab-bst-bot.service.in
@@ -9,4 +9,4 @@ Group = fedora
Restart = on-failure
[Install]
-WantedBy=default.target
+WantedBy=multi-user.target
diff --git a/baserock_webserver/hastebin/haste-server.service.in b/baserock_webserver/hastebin/haste-server.service.in
index 1da2c588..944fc576 100644
--- a/baserock_webserver/hastebin/haste-server.service.in
+++ b/baserock_webserver/hastebin/haste-server.service.in
@@ -10,4 +10,4 @@ Group = hastebin
Restart = on-failure
[Install]
-WantedBy=default.target
+WantedBy=multi-user.target
diff --git a/baserock_webserver/instance-gitlab-bot-config.yml b/baserock_webserver/instance-gitlab-bot-config.yml
index 4fb7710e..29368122 100644
--- a/baserock_webserver/instance-gitlab-bot-config.yml
+++ b/baserock_webserver/instance-gitlab-bot-config.yml
@@ -41,4 +41,5 @@
name: gitlab-bst-bot
enabled: yes
state: restarted
+ daemon_reload: yes
become: yes
diff --git a/baserock_webserver/instance-hastebin-config.yml b/baserock_webserver/instance-hastebin-config.yml
index e78ec327..aacffe0a 100644
--- a/baserock_webserver/instance-hastebin-config.yml
+++ b/baserock_webserver/instance-hastebin-config.yml
@@ -55,4 +55,5 @@
name: "{{ haste_server_service_name }}"
enabled: yes
state: restarted
+ daemon_reload: yes
become: yes