Skip to content
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

Fix the projects directory default in framework.properies. #104

Merged
merged 1 commit into from
Jun 5, 2015
Merged

Fix the projects directory default in framework.properies. #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
'framework.server.username' => 'admin',
'framework.server.password' => 'admin',
'rdeck.base' => '/var/lib/rundeck',
'framework.projects.dir' => '/var/rundeck/projects',
'framework.projects.dir' => '/var/lib/rundeck/projects',
'framework.etc.dir' => '/etc/rundeck',
'framework.var.dir' => '/var/lib/rundeck/var',
'framework.tmp.dir' => '/var/lib/rundeck/var/tmp',
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/rundeck_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class { 'rundeck': }
EOS

# Run it twice and test for idempotency
expect(apply_manifest(pp).exit_code).to_not eq(1)
expect(apply_manifest(pp, :expect_changes => true).exit_code).to eq(2)
expect(apply_manifest(pp).exit_code).to eq(0)
end

Expand Down
2 changes: 1 addition & 1 deletion spec/classes/config/global/framework_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'framework.server.url' => 'http://test.domain.com:4440',
'framework.server.username' => 'admin',
'framework.server.password' => 'admin',
'framework.projects.dir' => '/var/rundeck/projects',
'framework.projects.dir' => '/var/lib/rundeck/projects',
'framework.etc.dir' => '/etc/rundeck',
'framework.var.dir' => '/var/lib/rundeck/var',
'framework.tmp.dir' => '/var/lib/rundeck/var/tmp',
Expand Down
6 changes: 3 additions & 3 deletions spec/classes/config/global/project_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
}}

project_details = {
'project.dir' => '/var/rundeck/projects/${project.name}',
'project.etc.dir' => '/var/rundeck/projects/${project.name}/etc',
'project.resources.file' => '/var/rundeck/projects/${project.name}/etc/resources.xml',
'project.dir' => '/var/lib/rundeck/projects/${project.name}',
'project.etc.dir' => '/var/lib/rundeck/projects/${project.name}/etc',
'project.resources.file' => '/var/lib/rundeck/projects/${project.name}/etc/resources.xml',
'project.description' => '',
'project.organization' => ''
}
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
content.should include('-Drundeck.server.configDir=/etc/rundeck')
content.should include('-Dserver.datastore.path=/var/lib/rundeck/data')
content.should include('-Drundeck.server.serverDir=/var/lib/rundeck')
content.should include('-Drdeck.projects=/var/rundeck/projects')
content.should include('-Drdeck.projects=/var/lib/rundeck/projects')
content.should include('-Drdeck.runlogs=/var/lib/rundeck/logs')
content.should include('-Drundeck.config.location=/etc/rundeck/rundeck-config.groovy')
content.should include('-Djava.security.auth.login.config=/etc/rundeck/jaas-auth.conf')
Expand Down
12 changes: 6 additions & 6 deletions spec/defines/config/resource_source_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@
'resources.source.1.config.includeServerNode' => 'false',
'resources.source.1.config.generateFileAutomatically' => 'true',
'resources.source.1.config.format' => 'resourcexml',
'resources.source.1.config.file' => '/var/rundeck/projects/test/etc/source one.xml',
'resources.source.1.config.file' => '/var/lib/rundeck/projects/test/etc/source one.xml',
'resources.source.1.type' => 'file'
}

file_details.each do |key,value|
it { should contain_ini_setting("source one::#{key}").with(
'path' => '/var/rundeck/projects/test/etc/project.properties',
'path' => '/var/lib/rundeck/projects/test/etc/project.properties',
'setting' => key,
'value' => value
) }
end

it do
should contain_file('/var/rundeck/projects/test').with(
should contain_file('/var/lib/rundeck/projects/test').with(
'owner' => 'rundeck',
'group' => 'rundeck'
)
Expand Down Expand Up @@ -66,7 +66,7 @@

url_details.each do |key,value|
it { should contain_ini_setting("source one::#{key}").with(
'path' => '/var/rundeck/projects/test/etc/project.properties',
'path' => '/var/lib/rundeck/projects/test/etc/project.properties',
'setting' => key,
'value' => value
) }
Expand Down Expand Up @@ -94,7 +94,7 @@

directory_details.each do |key,value|
it { should contain_ini_setting("source one::#{key}").with(
'path' => '/var/rundeck/projects/test/etc/project.properties',
'path' => '/var/lib/rundeck/projects/test/etc/project.properties',
'setting' => key,
'value' => value
) }
Expand Down Expand Up @@ -131,7 +131,7 @@

script_details.each do |key,value|
it { should contain_ini_setting("source one::#{key}").with(
'path' => '/var/rundeck/projects/test/etc/project.properties',
'path' => '/var/lib/rundeck/projects/test/etc/project.properties',
'setting' => key,
'value' => value
) }
Expand Down