Skip to content

[WIP] Systemd Service Bin Paths #5

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

Closed
wants to merge 3 commits into from
Closed

[WIP] Systemd Service Bin Paths #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68e9332
Add /usr/local/bin to systemd path
djtaylor Jun 17, 2017
c39dfd0
Convert bin paths in system to use env
djtaylor Jun 17, 2017
ef50322
Fix travis errors for operands
djtaylor Jun 17, 2017
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
8 changes: 4 additions & 4 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
$mounts = {},
) inherits yas3fs::params {

anchor { 'yas3fs::begin': } ->
class { '::yas3fs::package': } ->
class { '::yas3fs::config': } ->
anchor { 'yas3fs::end':}
anchor { 'yas3fs::begin': }
-> class { '::yas3fs::package': }
-> class { '::yas3fs::config': }
-> anchor { 'yas3fs::end':}

if !empty($mounts) {
create_resources('yas3fs::mount', $mounts)
Expand Down
2 changes: 1 addition & 1 deletion manifests/mount.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
exec { "yas3fs_reload_systemd-${name}":
# SystemD needs a reload after any unit file change
command => 'systemctl daemon-reload',
path => ['/bin', '/sbin', '/usr/bin', '/usr/sbin'],
path => ['/bin', '/sbin', '/usr/bin', '/usr/sbin', '/usr/local/bin'],
refreshonly => true,
subscribe => File["yas3fs-${name}"],
before => Service["s3fs-${name}"],
Expand Down
4 changes: 2 additions & 2 deletions templates/systemd.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Environment=AWS_ACCESS_KEY_ID=<%= @aws_access_key_id %> AWS_SECRET_ACCESS_KEY=<%
# TODO: systemd requires a fully qualified path... but Puppet doesn't give us a
# good way to query what the path to a particular binary is :-/ This may need
# some further work, PRs welcome
ExecStart=/usr/bin/yas3fs -f <%= cmd_args %> <%= @s3_url %> <%= @local_path %>
ExecStop=/bin/umount <%= @local_path %>
ExecStart=/usr/bin/env yas3fs -f <%= cmd_args %> <%= @s3_url %> <%= @local_path %>
ExecStop=/usr/bin/env umount <%= @local_path %>
RestartSec=5
Restart=on-failure
OOMScoreAdjust=-1000
Expand Down