Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/postgresql/files/, dev-db/postgresql/
Date: Sun, 25 Oct 2015 21:10:14
Message-Id: 1445802300.4d732339911b0ea2aa9b994efe17a92d42281504.mgorny@gentoo
1 commit: 4d732339911b0ea2aa9b994efe17a92d42281504
2 Author: Elias Probst <mail <AT> eliasprobst <DOT> eu>
3 AuthorDate: Fri Oct 23 21:25:09 2015 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 25 19:45:00 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d732339
7
8 dev-db/postgresql: Handle RuntimeDirectory in systemd unit
9
10 Instead of using a separate `tmpfiles.d` definition to create
11 `/run/postgresql`, let the service unit take care of it on its
12 own. This prevents situations where the postgresql service can't
13 start because `systemd-tmpfiles` wasn't run yet.
14
15 Bug: https://bugs.gentoo.org/show_bug.cgi?id=563122
16
17 Package-Manager: portage-2.2.23
18
19 dev-db/postgresql/files/postgresql.service | 4 ++++
20 dev-db/postgresql/files/postgresql.tmpfilesd | 1 -
21 .../{postgresql-9.0.23.ebuild => postgresql-9.0.23-r1.ebuild} | 2 --
22 .../{postgresql-9.1.19.ebuild => postgresql-9.1.19-r1.ebuild} | 2 --
23 .../{postgresql-9.2.14.ebuild => postgresql-9.2.14-r1.ebuild} | 2 --
24 .../{postgresql-9.3.10.ebuild => postgresql-9.3.10-r1.ebuild} | 2 --
25 .../{postgresql-9.4.5.ebuild => postgresql-9.4.5-r1.ebuild} | 2 --
26 .../{postgresql-9.5_beta1.ebuild => postgresql-9.5_beta1-r1.ebuild} | 2 --
27 dev-db/postgresql/postgresql-9999.ebuild | 2 --
28 9 files changed, 4 insertions(+), 15 deletions(-)
29
30 diff --git a/dev-db/postgresql/files/postgresql.service b/dev-db/postgresql/files/postgresql.service
31 index 20ed27a..a607169 100644
32 --- a/dev-db/postgresql/files/postgresql.service
33 +++ b/dev-db/postgresql/files/postgresql.service
34 @@ -47,5 +47,9 @@ TimeoutSec=300
35 # Disable OOM kill on the postmaster
36 OOMScoreAdjust=-1000
37
38 +# Make sure the required runtimedir is present
39 +RuntimeDirectory=postgresql
40 +RuntimeDirectoryMode=1775
41 +
42 [Install]
43 WantedBy=multi-user.target
44
45 diff --git a/dev-db/postgresql/files/postgresql.tmpfilesd b/dev-db/postgresql/files/postgresql.tmpfilesd
46 deleted file mode 100644
47 index 26f44ef..0000000
48 --- a/dev-db/postgresql/files/postgresql.tmpfilesd
49 +++ /dev/null
50 @@ -1 +0,0 @@
51 -d /run/postgresql 1775 postgres postgres -
52
53 diff --git a/dev-db/postgresql/postgresql-9.0.23.ebuild b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
54 similarity index 99%
55 rename from dev-db/postgresql/postgresql-9.0.23.ebuild
56 rename to dev-db/postgresql/postgresql-9.0.23-r1.ebuild
57 index 174a686..ac1b4fe 100644
58 --- a/dev-db/postgresql/postgresql-9.0.23.ebuild
59 +++ b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
60 @@ -198,8 +198,6 @@ src_install() {
61 "${FILESDIR}/${PN}.service" | \
62 systemd_newunit - ${PN}-${SLOT}.service
63
64 - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
65 -
66 newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
67
68 use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
69
70 diff --git a/dev-db/postgresql/postgresql-9.1.19.ebuild b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
71 similarity index 99%
72 rename from dev-db/postgresql/postgresql-9.1.19.ebuild
73 rename to dev-db/postgresql/postgresql-9.1.19-r1.ebuild
74 index e2ab37e..817622c 100644
75 --- a/dev-db/postgresql/postgresql-9.1.19.ebuild
76 +++ b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
77 @@ -202,8 +202,6 @@ src_install() {
78 "${FILESDIR}/${PN}.service" | \
79 systemd_newunit - ${PN}-${SLOT}.service
80
81 - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
82 -
83 newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
84
85 use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
86
87 diff --git a/dev-db/postgresql/postgresql-9.2.14.ebuild b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
88 similarity index 99%
89 rename from dev-db/postgresql/postgresql-9.2.14.ebuild
90 rename to dev-db/postgresql/postgresql-9.2.14-r1.ebuild
91 index 6ec39d3..83a2fa7 100644
92 --- a/dev-db/postgresql/postgresql-9.2.14.ebuild
93 +++ b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
94 @@ -196,8 +196,6 @@ src_install() {
95 "${FILESDIR}/${PN}.service" | \
96 systemd_newunit - ${PN}-${SLOT}.service
97
98 - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
99 -
100 newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
101
102 use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
103
104 diff --git a/dev-db/postgresql/postgresql-9.3.10.ebuild b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
105 similarity index 99%
106 rename from dev-db/postgresql/postgresql-9.3.10.ebuild
107 rename to dev-db/postgresql/postgresql-9.3.10-r1.ebuild
108 index dc084ca..2367c97 100644
109 --- a/dev-db/postgresql/postgresql-9.3.10.ebuild
110 +++ b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
111 @@ -196,8 +196,6 @@ src_install() {
112 "${FILESDIR}/${PN}.service" | \
113 systemd_newunit - ${PN}-${SLOT}.service
114
115 - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
116 -
117 newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
118
119 use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
120
121 diff --git a/dev-db/postgresql/postgresql-9.4.5.ebuild b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
122 similarity index 99%
123 rename from dev-db/postgresql/postgresql-9.4.5.ebuild
124 rename to dev-db/postgresql/postgresql-9.4.5-r1.ebuild
125 index a411b38..d705b10 100644
126 --- a/dev-db/postgresql/postgresql-9.4.5.ebuild
127 +++ b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
128 @@ -228,8 +228,6 @@ src_install() {
129 "${FILESDIR}/${PN}.service" | \
130 systemd_newunit - ${PN}-${SLOT}.service
131
132 - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
133 -
134 newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
135
136 use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
137
138 diff --git a/dev-db/postgresql/postgresql-9.5_beta1.ebuild b/dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild
139 similarity index 99%
140 rename from dev-db/postgresql/postgresql-9.5_beta1.ebuild
141 rename to dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild
142 index 50d2cec..cc14882 100644
143 --- a/dev-db/postgresql/postgresql-9.5_beta1.ebuild
144 +++ b/dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild
145 @@ -234,8 +234,6 @@ src_install() {
146 "${FILESDIR}/${PN}.service" | \
147 systemd_newunit - ${PN}-${SLOT}.service
148
149 - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
150 -
151 newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
152
153 use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
154
155 diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
156 index 36e35fd..c2fe866 100644
157 --- a/dev-db/postgresql/postgresql-9999.ebuild
158 +++ b/dev-db/postgresql/postgresql-9999.ebuild
159 @@ -186,8 +186,6 @@ src_install() {
160 "${FILESDIR}/${PN}.service" | \
161 systemd_newunit - ${PN}-${SLOT}.service
162
163 - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
164 -
165 newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
166
167 use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
Report Message
Find on MARC Find on Google Groups