changed user to use common.yaml service_user

manifests/config.pp

@@ -1,8 +1,8 @@
 class sabnzbd::config {
     file { "$log_dir":
         ensure => directory,
-        owner => "sabnzbd",
-        group => "sabnzbd",
+        owner => "$services_user",
+        group => "$services_user",
     }
     if $logrotate {
         logrotate::rule { 'sabnzbd':
@@ -15,28 +15,28 @@
     }
     file { "$base_dir/sabnzbd/config/":
         ensure => directory,
-        owner => 'sabnzbd',
-        group => 'sabnzbd',
+        owner => "$services_user",
+        group => "$services_user",
     }
     file { "$base_dir/sabnzbd/config/sabnzbd.ini":
         content => template('sabnzbd/sabnzbd.ini.erb'),
-        owner => 'sabnzbd',
-        group => 'sabnzbd',
+        owner => "$services_user",
+        group => "$services_user",
         mode => '0644',
         require => File["$base_dir/sabnzbd/config/"],
         notify => Service['supervisor::sabnzbd'],
     }
 
     file { "$cache_dir":
         ensure => directory,
-        owner => 'sabnzbd',
-        group => 'sabnzbd',
+        owner => "$services_user",
+        group => "$services_user",
         mode => '0644',
     }
     file { "$scripts_dir":
         ensure => directory,
-        owner => 'sabnzbd',
-        group => 'sabnzbd',
+        owner => "$services_user",
+        group => "$services_user",
         mode => '0644',
     }
 

manifests/init.pp

@@ -15,49 +15,46 @@
         'python-yenc':
             ensure => present;
     }
-	user { 'sabnzbd':
-        allowdupe => false,
-        ensure => 'present',
-        shell => '/bin/bash',
-        home => "$base_dir/sabnzbd",
-        password => '*',
-    }
+#	user { "$services_user":
+#        allowdupe => false,
+#        ensure => 'present',
+#    }
 
     file { "$base_dir/sabnzbd":
         ensure => directory,
-        owner => 'sabnzbd',
-        group => 'sabnzbd',
+        owner => "$services_user",
+        group => "$services_user",
         mode => '0644',
     }
     exec { 'venv-create-sabnzbd':
         command => "virtualenv $venv_dir",
         cwd => "$base_dir/sabnzbd",
         creates => "$base_dir/sabnzbd/$venv_dir/bin/activate",
         path => '/usr/bin/',
-        user => 'sabnzbd',
+        user => "$services_user",
         require => [Class['python::virtualenv'], Package['python-yenc']];
     }
     exec { 'download-sabnzbd':
         command => "/usr/bin/git clone $url src",
         cwd     => "$base_dir/sabnzbd",
         creates => "$base_dir/sabnzbd/src",
-        user => 'sabnzbd',
+        user => "$services_user",
         require => Class['git'],
     }
     exec { 'install-pyopenssl':
         command => "$base_dir/sabnzbd/venv/bin/pip install pyOpenSSL",
         cwd => "$base_dir/sabnzbd/venv",
         creates => "$base_dir/sabnzbd/venv/lib/python2.7/site-packages/OpenSSL",
         path => "$base_dir/sabnzbd/venv/bin:/usr/bin",
-        user => 'sabnzbd',
+        user => "$services_user",
         require => Exec['venv-create-sabnzbd'];
     }
     exec { 'install-cheetah-sabnzbd':
         command => "$base_dir/sabnzbd/venv/bin/pip install cheetah",
         cwd => "$base_dir/sabnzbd/venv",
         creates => "$base_dir/sabnzbd/venv/bin/cheetah",
         path => "$base_dir/sabnzbd/venv/bin",
-        user => 'sabnzbd',
+        user => "$services_user",
         require => Exec['venv-create-sabnzbd'];
     }
     supervisor::service {
@@ -67,8 +64,8 @@
             stdout_logfile => "$base_dir/sabnzbd/log/supervisor.log",
             stderr_logfile => "$base_dir/sabnzbd/log/supervisor.log",
             command => "$base_dir/sabnzbd/venv/bin/python $base_dir/sabnzbd/src/SABnzbd.py -f $base_dir/sabnzbd/config/sabnzbd.ini",
-            user => 'sabnzbd',
-            group => 'sabnzbd',
+            user => "$services_user",
+            group => "$services_user",
             directory => "$base_dir/sabnzbd/src/",
             require => Exec['download-sabnzbd'],
     }

manifests/params.pp

@@ -34,6 +34,7 @@
     $logrotate = hiera("logrotate", "false"),
 )
 {
+    $services_user = hiera("services_user")
     $scripts_dir = "$base_dir/sabnzbd/scripts"
     $log_dir = "$base_dir/sabnzbd/log"
     $admin_dir = "$base_dir/sabnzbd/admin"