Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ansible/group_vars/all/websites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,5 @@ websites:
- name: "rottenspringbok.{{ canonical_hostname }}"
user: "rotten_springbok"
custom_config: true
alternative_names: []
state: "present"
2 changes: 2 additions & 0 deletions ansible/roles/committeeclash/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
shell: "/usr/sbin/nologin"
state: "present"
system: true
groups: "docker"
append: true
Comment on lines +9 to +10
Copy link
Member

Choose a reason for hiding this comment

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

Why is this needed? All docker commands should be done under the root user

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It doesn’t run the compose-up file if the user isn’t in docker group.

Copy link
Member

Choose a reason for hiding this comment

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

What is "it"? Ansible doing the compose-up.yml task as the commiteeclash unprivileged user (which is unprivileged for a reason, to limit attack vectors)? You can do the same task but as root, just like outline. If root cannot run ducker compose up something is going wrong

Copy link
Member

Choose a reason for hiding this comment

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


- name: "set up committeeclash"
become_user: "committeeclash"
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/committeeclash/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
committeeclash_port: 4569
committeeclash_docs_port: 4571
committeeclash_project_source: /home/committeeclash
committeeclash_project_source: /var/www/committeeclash
2 changes: 2 additions & 0 deletions ansible/roles/rottenspringbok/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
shell: "/usr/sbin/nologin"
state: "present"
system: true
groups: "docker"
append: true

- name: "set up rottenspringbok"
become_user: "rottenspringbok"
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/rottenspringbok/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
rottenspringbok_port: 4572
rottenspringbok_project_source: /home/rotten_springbok
rottenspringbok_project_source: /var/www/rotten_springbok
Loading