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.

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

'/usr/sbin/nologin' fixes for Ubuntu and other distros #97

Merged
merged 1 commit into from
Feb 19, 2019
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
user:
name: haproxy_exporter
system: true
shell: "/sbin/nologin"
shell: "/usr/sbin/nologin"
group: haproxy_exporter
createhome: false

Expand Down
4 changes: 2 additions & 2 deletions core/core/src/ansible/roles/jmx-exporter/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
user:
name: "{{ jmx_exporter_user }}"
group: "{{ jmx_exporter_group }}"
shell: "/sbin/nologin"
shell: "/usr/sbin/nologin"
createhome: false
system: yes

Expand Down Expand Up @@ -41,4 +41,4 @@
src: /opt/jmx-exporter/jmx_prometheus_javaagent-{{ prometheus_jmx_version }}.jar
path: "{{ prometheus_jmx_path }}"
force: yes
state: link
state: link
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
user:
name: kafka_exporter
system: true
shell: "/sbin/nologin"
shell: "/usr/sbin/nologin"
group: kafka_exporter
createhome: false

Expand Down
2 changes: 1 addition & 1 deletion core/core/src/ansible/roles/kafka/tasks/metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
user:
name: prometheus
system: true
shell: "/sbin/nologin"
shell: "/usr/sbin/nologin"
group: prometheus
createhome: false
delegate_to: "{{ item }}"
Expand Down
2 changes: 1 addition & 1 deletion core/core/src/ansible/roles/kafka/tasks/setup-kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
name: "{{ kafka_var.user }}"
system: yes
group: "{{ kafka_var.group }}"
shell: "/sbin/nologin"
shell: "/usr/sbin/nologin"

- name: Check for Kafka package
stat:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
user:
name: node_exporter
system: true
shell: "/sbin/nologin"
shell: "/usr/sbin/nologin"
group: node_exporter
createhome: false

Expand Down
2 changes: 1 addition & 1 deletion core/core/src/ansible/roles/prometheus/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
user:
name: prometheus
system: true
shell: "/sbin/nologin"
shell: "/usr/sbin/nologin"
group: prometheus
createhome: false

Expand Down
2 changes: 1 addition & 1 deletion core/core/src/ansible/roles/zookeeper/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
name: "{{ zookeeper_user }}"
group: "{{ zookeeper_group }}"
system: yes
shell: "/sbin/nologin"
shell: "/usr/sbin/nologin"

- name: Check for Zookeeper package
stat:
Expand Down
2 changes: 1 addition & 1 deletion core/core/src/ansible/roles/zookeeper/tasks/metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
user:
name: prometheus
system: true
shell: "/sbin/nologin"
shell: "/usr/sbin/nologin"
group: prometheus
createhome: false
delegate_to: "{{ item }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

describe user('jmx-exporter') do
it { should exist }
it { should have_login_shell '/sbin/nologin' }
it { should have_login_shell '/usr/sbin/nologin' }
end

describe group('jmx-exporter') do
Expand Down
2 changes: 1 addition & 1 deletion core/core/test/serverspec/spec/kafka/kafka_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

describe user('kafka') do
it { should exist }
it { should have_login_shell '/sbin/nologin' }
it { should have_login_shell '/usr/sbin/nologin' }
it { should belong_to_group 'kafka' }
it { should belong_to_group 'jmx-exporter' }
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@

describe user('prometheus') do
it { should exist }
it { should have_login_shell '/sbin/nologin' }
it { should have_login_shell '/usr/sbin/nologin' }
it { should belong_to_group 'prometheus' }
end
2 changes: 1 addition & 1 deletion core/core/test/serverspec/spec/zookeeper/zookeeper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

describe user('zookeeper') do
it { should exist }
it { should have_login_shell '/sbin/nologin' }
it { should have_login_shell '/usr/sbin/nologin' }
it { should belong_to_group 'zookeeper' }
it { should belong_to_group 'jmx-exporter' }
end
Expand Down