diff --git a/site-modules/profile/manifests/jenkins/agent.pp b/site-modules/profile/manifests/jenkins/agent.pp index 7b20ca7c..aa1a1894 100644 --- a/site-modules/profile/manifests/jenkins/agent.pp +++ b/site-modules/profile/manifests/jenkins/agent.pp @@ -1,45 +1,45 @@ class profile::jenkins::agent { include profile::jenkins::base include ::java $jenkins_agent_jar_url = lookup('jenkins::agent::jar_url') $jenkins_jnlp_url = lookup('jenkins::agent::jnlp::url') $jenkins_jnlp_token = lookup('jenkins::agent::jnlp::token') + $workdir = '/var/lib/jenkins/agent-workdir' + file {$workdir: + mode => '0700', + owner => 'jenkins', + group => 'jenkins', + } + $jenkins_agent_jar = '/usr/share/jenkins/agent.jar' file {$jenkins_agent_jar: source => $jenkins_agent_jar_url, mode => '0644', owner => 'root', group => 'root', } $environment_file = '/etc/default/jenkins-agent' file {$environment_file: # Contains credentials mode => '0600', owner => 'root', group => 'root', content => template('profile/jenkins/agent/jenkins-agent.defaults.erb'), notify => Service['jenkins-agent'], } - $workdir = '/var/lib/jenkins/agent-workdir' - file {$workdir: - mode => '0700', - owner => 'jenkins', - group => 'jenkins', - } - ::systemd::unit_file {'jenkins-agent.service': ensure => present, content => template('profile/jenkins/agent/jenkins-agent.service.erb'), } -> service {'jenkins-agent': ensure => running, enable => true, require => [ File[$environment_file], File[$workdir], ], } }