Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make ocf-create.conf readable only by root #1217

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make ocf-create.conf readable only by root #1217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions modules/ocf_admin/manifests/create.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
'/etc/ocf-create':
ensure => directory;

# TODO: ideally this file wouldn't be directly readable by staff
'/etc/ocf-create/ocf-create.conf':
group => ocfstaff,
group => ocfroot,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approve still needs the file to read the celery connection info; did you intend for approve to become root-only?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, it seems the proper solution for this is to separate out celery.broker and celery.backend to a separate config file... is it worth the effort at this point when we're planning to redo secrets management for create when it gets moved into newk8s?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think approve is mostly used by rootstaff anyway, so this is probably a good idea?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're going to make approve root-only, don't forget to update the docs. I can think of https://www.ocf.berkeley.edu/docs/staff/scripts/approve/ and https://www.ocf.berkeley.edu/docs/staff/powers/ as pages that mention this.

content => template('ocf_admin/create.conf.erb'),
mode => '0440',
show_diff => false;
Expand Down