Skip to content

Commit e6bb122

Browse files
M0Rf30M0Rf30
committed
fix: remove redundant mkdir/chown from postinst scripts
Directory creation for amavisd, clamav, opendkim, postfix is now handled by their respective packages' tmpfiles.d configurations: - carbonio-amavisd: /opt/zextras/data/amavisd/* - carbonio-clamav: /opt/zextras/data/clamav/db - carbonio-postfix: /opt/zextras/data/postfix/* - carbonio-mta: /opt/zextras/data/opendkim, altermime This removes ~100 lines of duplicate directory setup code from all 4 postinst functions.
1 parent 9dc9940 commit e6bb122

File tree

1 file changed

+4
-104
lines changed

1 file changed

+4
-104
lines changed

‎mta/PKGBUILD‎

Lines changed: 4 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -172,32 +172,7 @@ postinst__apt() {
172172
fi
173173
fi
174174

175-
chown zextras:zextras /opt/zextras/common/conf/master.cf.in
176-
chmod 440 /opt/zextras/common/conf/master.cf.in
177-
chown zextras:zextras /opt/zextras/common/conf/tag_as_*.re.in
178-
179-
mkdir -p /opt/zextras/data/amavisd/db
180-
mkdir -p /opt/zextras/data/amavisd/tmp
181-
mkdir -p /opt/zextras/data/amavisd/var
182-
mkdir -p /opt/zextras/data/amavisd/quarantine
183-
chown -R zextras:zextras /opt/zextras/data/amavisd/*
184-
185-
mkdir -p /opt/zextras/data/opendkim
186-
chown -R zextras:zextras /opt/zextras/data/opendkim
187-
188-
mkdir -p /opt/zextras/data/clamav/db
189-
chown -R zextras:zextras /opt/zextras/data/clamav/db
190-
191-
mkdir -p /opt/zextras/data/postfix/spool/pid
192-
chown postfix:zextras /opt/zextras/data/postfix
193-
chown root:postfix /opt/zextras/data/postfix/spool
194-
chown postfix:root /opt/zextras/data/postfix/spool/pid
195-
196-
chown zextras:zextras /opt/zextras/data
197-
198-
if [ -f /opt/zextras/common/conf/main.cf ]; then
199-
chown zextras:zextras /opt/zextras/common/conf/main.cf
200-
fi
175+
# Note: Directory creation for amavisd, clamav, postfix handled by their respective packages' tmpfiles.d
201176

202177
if [ ! -e /etc/aliases ] || [ -L /etc/aliases ]; then
203178
if [ -L /etc/aliases ]; then
@@ -240,32 +215,7 @@ postinst__ubuntu_noble() {
240215
fi
241216
fi
242217

243-
chown zextras:zextras /opt/zextras/common/conf/master.cf.in
244-
chmod 440 /opt/zextras/common/conf/master.cf.in
245-
chown zextras:zextras /opt/zextras/common/conf/tag_as_*.re.in
246-
247-
mkdir -p /opt/zextras/data/amavisd/db
248-
mkdir -p /opt/zextras/data/amavisd/tmp
249-
mkdir -p /opt/zextras/data/amavisd/var
250-
mkdir -p /opt/zextras/data/amavisd/quarantine
251-
chown -R zextras:zextras /opt/zextras/data/amavisd/*
252-
253-
mkdir -p /opt/zextras/data/opendkim
254-
chown -R zextras:zextras /opt/zextras/data/opendkim
255-
256-
mkdir -p /opt/zextras/data/clamav/db
257-
chown -R zextras:zextras /opt/zextras/data/clamav/db
258-
259-
mkdir -p /opt/zextras/data/postfix/spool/pid
260-
chown postfix:zextras /opt/zextras/data/postfix
261-
chown root:postfix /opt/zextras/data/postfix/spool
262-
chown postfix:root /opt/zextras/data/postfix/spool/pid
263-
264-
chown zextras:zextras /opt/zextras/data
265-
266-
if [ -f /opt/zextras/common/conf/main.cf ]; then
267-
chown zextras:zextras /opt/zextras/common/conf/main.cf
268-
fi
218+
# Note: Directory creation for amavisd, clamav, postfix handled by their respective packages' tmpfiles.d
269219

270220
if [ ! -e /etc/aliases ] || [ -L /etc/aliases ]; then
271221
if [ -L /etc/aliases ]; then
@@ -295,32 +245,7 @@ postinst__ubuntu_noble() {
295245
}
296246

297247
postinst__rocky_8() {
298-
chown zextras:zextras /opt/zextras/common/conf/master.cf.in
299-
chmod 440 /opt/zextras/common/conf/master.cf.in
300-
chown zextras:zextras /opt/zextras/common/conf/tag_as_*.re.in
301-
302-
mkdir -p /opt/zextras/data/amavisd/db
303-
mkdir -p /opt/zextras/data/amavisd/tmp
304-
mkdir -p /opt/zextras/data/amavisd/var
305-
mkdir -p /opt/zextras/data/amavisd/quarantine
306-
chown -R zextras:zextras /opt/zextras/data/amavisd/*
307-
308-
mkdir -p /opt/zextras/data/opendkim
309-
chown -R zextras:zextras /opt/zextras/data/opendkim
310-
311-
mkdir -p /opt/zextras/data/clamav/db
312-
chown -R zextras:zextras /opt/zextras/data/clamav/db
313-
314-
mkdir -p /opt/zextras/data/postfix/spool/pid
315-
chown postfix:zextras /opt/zextras/data/postfix
316-
chown root:postfix /opt/zextras/data/postfix/spool
317-
chown postfix:root /opt/zextras/data/postfix/spool/pid
318-
319-
chown zextras:zextras /opt/zextras/data
320-
321-
if [ -f /opt/zextras/common/conf/main.cf ]; then
322-
chown zextras:zextras /opt/zextras/common/conf/main.cf
323-
fi
248+
# Note: Directory creation for amavisd, clamav, postfix handled by their respective packages' tmpfiles.d
324249

325250
if [ ! -e /etc/aliases ] || [ -L /etc/aliases ]; then
326251
if [ -L /etc/aliases ]; then
@@ -349,32 +274,7 @@ postinst__rocky_8() {
349274
}
350275

351276
postinst__rocky_9() {
352-
chown zextras:zextras /opt/zextras/common/conf/master.cf.in
353-
chmod 440 /opt/zextras/common/conf/master.cf.in
354-
chown zextras:zextras /opt/zextras/common/conf/tag_as_*.re.in
355-
356-
mkdir -p /opt/zextras/data/amavisd/db
357-
mkdir -p /opt/zextras/data/amavisd/tmp
358-
mkdir -p /opt/zextras/data/amavisd/var
359-
mkdir -p /opt/zextras/data/amavisd/quarantine
360-
chown -R zextras:zextras /opt/zextras/data/amavisd/*
361-
362-
mkdir -p /opt/zextras/data/opendkim
363-
chown -R zextras:zextras /opt/zextras/data/opendkim
364-
365-
mkdir -p /opt/zextras/data/clamav/db
366-
chown -R zextras:zextras /opt/zextras/data/clamav/db
367-
368-
mkdir -p /opt/zextras/data/postfix/spool/pid
369-
chown postfix:zextras /opt/zextras/data/postfix
370-
chown root:postfix /opt/zextras/data/postfix/spool
371-
chown postfix:root /opt/zextras/data/postfix/spool/pid
372-
373-
chown zextras:zextras /opt/zextras/data
374-
375-
if [ -f /opt/zextras/common/conf/main.cf ]; then
376-
chown zextras:zextras /opt/zextras/common/conf/main.cf
377-
fi
277+
# Note: Directory creation for amavisd, clamav, postfix handled by their respective packages' tmpfiles.d
378278

379279
if [ ! -e /etc/aliases ] || [ -L /etc/aliases ]; then
380280
if [ -L /etc/aliases ]; then

0 commit comments

Comments
 (0)