Attempt to eliminate hardcoded paths for yas3fs and python

Thank you @djtaylor
pcfens#5

Closes !5

Author: mojibake-umd

manifests/package.pp

@@ -61,9 +61,12 @@
     $_exec_command = ". ${venv_path}/bin/activate && ${python_version} /var/tmp/yas3fs/setup.py install --prefix=${venv_path}"
     $_exec_creates = "${venv_path}/bin/yas3fs"
   }else{
-    $_exec_command = "/usr/bin/${python_version} /var/tmp/yas3fs/setup.py install"
+    $_exec_command = "/usr/bin/env ${python_version} /var/tmp/yas3fs/setup.py install"
+    # Users which install does not create /usr/bin/yasfs consider making a symlink to
+    # Wherever it got installed so puppet will not attempt to reinstall every run
+    # I can really only test on a Redhat machine and relay on rspec to test everything else
+    # - Ron (mojibake-umd) -
     $_exec_creates = '/usr/bin/yas3fs'
-
   }
 
   exec { 'install yas3fs':

spec/classes/yas3fs_spec.rb

@@ -39,7 +39,7 @@
             }
             it {
               is_expected.to contain_exec('install yas3fs').with(
-                'command' => '/usr/bin/python3 /var/tmp/yas3fs/setup.py install',
+                'command' => '/usr/bin/env python3 /var/tmp/yas3fs/setup.py install',
                 'creates' => '/usr/bin/yas3fs',
                 'cwd'     => '/var/tmp/yas3fs',
                 'require' => 'Vcsrepo[/var/tmp/yas3fs]',
@@ -89,6 +89,7 @@
                 'venv_path' => '/opt/yas3fs/venv'
               }
             end
+
             it {
               is_expected.to contain_exec('install yas3fs').with(
                 'command' => '. /opt/yas3fs/venv/bin/activate && python3 /var/tmp/yas3fs/setup.py install --prefix=/opt/yas3fs/venv',

spec/defines/mount_spec.rb

@@ -30,7 +30,7 @@
         'ensure' => 'present',
         'path'   => '/etc/init/s3fs-test-mount.conf',
         'notify' => 'Service[s3fs-test-mount]',
-        'content' => /exec \/usr\/local\/bin\/yas3fs -f  \"\$S3_URL\" \"\$LOCAL_PATH\"/
+        'content' => %r{exec /usr/bin/env yas3fs -f  \"\$S3_URL\" \"\$LOCAL_PATH\"},
       )
       }
 
@@ -63,7 +63,7 @@
         'ensure' => 'present',
         'path'   => '/etc/init/s3fs-test-mount.conf',
         'notify' => 'Service[s3fs-test-mount]',
-        'content' => /exec \/opt\/yas3fs\/venv\/bin\/yas3fs -f  \"\$S3_URL\" \"\$LOCAL_PATH\"/
+        'content' => %r{exec /opt/yas3fs/venv/bin/yas3fs -f  \"\$S3_URL\" \"\$LOCAL_PATH\"},
       )
       }
 
@@ -103,7 +103,7 @@
         'ensure' => 'present',
         'path'   => '/etc/systemd/system/s3fs-test-mount.service',
         'notify' => 'Service[s3fs-test-mount]',
-        'content' => /ExecStart=\/usr\/bin\/yas3fs -f  s3:\/\/test-bucket \/media\/test-mount/
+        'content' => %r{ExecStart=/usr/bin/env yas3fs -f  s3://test-bucket /media/test-mount},
       )
       }
 
@@ -133,10 +133,9 @@
 
       it {
         is_expected.to contain_file('yas3fs-test-mount').with(
-          'content' => /\/opt\/yas3fs\/venv\/yas3fs -f  s3:\/\/test-bucket \/media\/test-mount/
+          'content' => %r{/opt/yas3fs/venv/bin/yas3fs -f  s3://test-bucket /media/test-mount},
         )
       }
-
     end
 
     context 'with sysvinit' do
@@ -159,7 +158,7 @@
           'ensure' => 'present',
           'path'   => '/etc/init.d/s3fs-test-mount',
           'notify' => 'Service[s3fs-test-mount]',
-          'content' => /PATH=\/usr\/local\/bin:\$PATH/
+          'content' => %r{PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:\$PATH},
         )
       }
 
@@ -188,7 +187,7 @@
 
       it {
         is_expected.to contain_file('yas3fs-test-mount').with(
-          'content' => /PATH=\/opt\/yas3fs\/venv:\/usr\/local\/bin:\$PATH/
+          'content' => %r{PATH=/opt/yas3fs/venv/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:\$PATH},
         )
       }
     end

templates/systemd.erb

@@ -13,17 +13,17 @@ Environment=AWS_ACCESS_KEY_ID=<%= @aws_access_key_id %> AWS_SECRET_ACCESS_KEY=<%
 <% @options.each do |v| -%>
 <% cmd_args = "#{cmd_args} --#{v}" -%>
 <% end -%>
-# 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
+# Thank @djtaylor https://github.com/pcfens/puppet-yas3fs/pull/5
+# /usr/bin/env yas3fs
 <% if @venv_path -%>
   WorkingDirectory=<%= @venv_path %>
-  Environment=PATH=<%= @venv_path %>/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/opt/puppetlabs/bin
-  ExecStart=<%= @venv_path %>/yas3fs -f <%= cmd_args %> <%= @s3_url %> <%= @local_path %>
+  Environment=PATH=<%= @venv_path %>/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+  ExecStart=<%= @venv_path %>/bin/yas3fs -f <%= cmd_args %> <%= @s3_url %> <%= @local_path %>
 <% else %>
-ExecStart=/usr/bin/yas3fs -f <%= cmd_args %> <%= @s3_url %> <%= @local_path %>
+  Environment=PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+  ExecStart=/usr/bin/env yas3fs -f <%= cmd_args %> <%= @s3_url %> <%= @local_path %>
 <% end %>
-ExecStop=/bin/umount <%= @local_path %>
+ExecStop=/usr/bin/env umount <%= @local_path %>
 RestartSec=5
 Restart=on-failure
 OOMScoreAdjust=-1000

templates/sysvinit.erb

@@ -14,9 +14,9 @@
 ### END INIT INFO
 
 <% if @venv_path -%>
-  PATH=<%= @venv_path %>:/usr/local/bin:$PATH
+  PATH=<%= @venv_path %>/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH
 <% else %>
-PATH=/usr/local/bin:$PATH
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH
 <% end %>
 
 export S3_URL="<%= @s3_url %>"

templates/upstart.erb

@@ -25,7 +25,7 @@ script
 <% if @venv_path -%>
   <%= "exec #{@venv_path}/bin/yas3fs -f #{cmd_args} \"$S3_URL\" \"$LOCAL_PATH\"" %>
 <% else %>
-  <%= "exec /usr/local/bin/yas3fs -f #{cmd_args} \"$S3_URL\" \"$LOCAL_PATH\"" %>
+  <%= "exec /usr/bin/env yas3fs -f #{cmd_args} \"$S3_URL\" \"$LOCAL_PATH\"" %>
 <% end %>
 end script