diff --git a/master/jenkins_files/templates/jenkins.ini.erb b/master/jenkins_files/templates/jenkins.ini.erb deleted file mode 100644 index 664418a3..00000000 --- a/master/jenkins_files/templates/jenkins.ini.erb +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -username=<%= scope.function_hiera(["jenkins::slave::ui_user"]) %> -password=<%= scope.function_hiera(["jenkins::slave::ui_pass"]) %> diff --git a/master/manifests/site.pp b/master/manifests/site.pp index 3d51df64..914bb724 100644 --- a/master/manifests/site.pp +++ b/master/manifests/site.pp @@ -57,25 +57,6 @@ } -$slave_buildfarm_config_dir = ['/home/jenkins-slave/.buildfarm'] -file { $slave_buildfarm_config_dir: - ensure => 'directory', - mode => '0640', - owner => jenkins-slave, - group => jenkins-slave, -} - -file { '/home/jenkins-slave/.buildfarm/jenkins.ini': - ensure => 'present', - mode => '0640', - owner => jenkins-slave, - group => jenkins-slave, - content => template('jenkins_files/jenkins.ini.erb'), - require => [User['jenkins-slave'], - File[$slave_buildfarm_config_dir],], - notify => Service['jenkins-slave'], -} - package { 'git': ensure => 'installed', } @@ -502,24 +483,6 @@ notify => Service['jenkins'], } -$buildfarm_config_dir = ['/var/lib/jenkins/.buildfarm'] -file { $buildfarm_config_dir: - ensure => 'directory', - mode => '0640', - owner => jenkins, - group => jenkins, -} -file { '/var/lib/jenkins/.buildfarm/jenkins.ini': - ensure => 'present', - mode => '0640', - owner => jenkins, - group => jenkins, - content => template('jenkins_files/jenkins.ini.erb'), - require => [Package['jenkins'], - File[$buildfarm_config_dir],], - notify => Service['jenkins'], -} - # For our convenience reading the logs class { 'timezone': timezone => hiera('timezone', 'America/Los_Angeles'),