Merge ~pelpsi/launchpad:copy-archive-publisher-missing-umask into launchpad:master

Proposed by Simone Pelosi
Status: Merged
Approved by: Simone Pelosi
Approved revision: 124a0dd93bfe4b49d9f45c0db1809ddd40c58ab6
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pelpsi/launchpad:copy-archive-publisher-missing-umask
Merge into: launchpad:master
Diff against target: 12 lines (+1/-1)
1 file modified
charm/launchpad-copy-archive-publisher/templates/crontab.j2 (+1/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+460488@code.launchpad.net

Commit message

Add umask 022 before publish-ftpmaster.py call

umask 022 is required to fix the following error:
`Queue item ignored: Bad umask; expected 022, got 002`

Support request:
https://chat.canonical.com/canonical/pl/uidssikjuiby5ja5p189cjz15y

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-copy-archive-publisher/templates/crontab.j2 b/charm/launchpad-copy-archive-publisher/templates/crontab.j2
2index 99eb759..bf2502b 100644
3--- a/charm/launchpad-copy-archive-publisher/templates/crontab.j2
4+++ b/charm/launchpad-copy-archive-publisher/templates/crontab.j2
5@@ -4,7 +4,7 @@ MAILTO={{ cron_mailto }}
6 LPCONFIG=launchpad-copy-archive-publisher
7
8 {% if active -%}
9-*/5 * * * * {{ code_dir }}/cronscripts/publish-ftpmaster.py --all-derived -vv >> {{ logs_dir }}/derived-publish-ftpmaster.log 2>&1
10+*/5 * * * * umask 022; {{ code_dir }}/cronscripts/publish-ftpmaster.py --all-derived -vv >> {{ logs_dir }}/derived-publish-ftpmaster.log 2>&1
11
12 10 */6 * * * {{ code_dir }}/scripts/process-death-row.py --all-derived -q --log-file=DEBUG:{{ logs_dir }}/derived-process-death-row.log
13

Subscribers

People subscribed via source and target branches

to status/vote changes: