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

Jump to bottom

Permissions for /etc/default/app_name changed to 644 #354

Merged
merged 2 commits into from
Sep 18, 2014
Merged

Permissions for /etc/default/app_name changed to 644 #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
157d34d
Permissions for /etc/default/app_name changed to 644
kardapoltsev Sep 18, 2014
94cc080
fix rpm tests with new /etc/default permissions
kardapoltsev Sep 18, 2014
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 src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ object JavaServerAppPackaging {
map makeEtcDefaultScript,
linuxPackageMappings <++= (makeEtcDefault, packageName in Linux) map { (conf, name) =>
conf.map(c => LinuxPackageMapping(Seq(c -> ("/etc/default/" + name)),
LinuxFileMetaData(Users.Root, Users.Root)).withConfig()).toSeq
LinuxFileMetaData(Users.Root, Users.Root, "644")).withConfig()).toSeq
},

// === /var/run/app pid folder ===
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/rpm/test-executableScriptName/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) =>
out.log.success(spec)
assert(spec contains "%attr(0644,root,root) /usr/share/rpm-test/lib/rpm-test.rpm-test-0.1.0.jar", "Wrong installation path\n" + spec)
assert(spec contains "%config %attr(0755,root,root) /etc/init.d/rpm-test", "Wrong /etc/init.d/\n" + spec)
assert(spec contains "%config %attr(755,root,root) /etc/default/rpm-test", "Wrong etc default file\n" + spec)
assert(spec contains "%config %attr(644,root,root) /etc/default/rpm-test", "Wrong etc default file\n" + spec)
assert(spec contains "%dir %attr(755,rpm-test,rpm-test) /var/log/rpm-test", "Wrong logging dir path\n" + spec)
assert(spec contains "%dir %attr(755,rpm-test,rpm-test) /var/run/rpm-test", "Wrong /var/run dir path\n" + spec)
out.log.success("Successfully tested rpm-test file")
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/rpm/test-packageName/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TaskKey[Unit]("check-spec-file") <<= (target, streams) map { (target, out) =>
out.log.success(spec)
assert(spec contains "%attr(0644,root,root) /usr/share/rpm-package/lib/rpm-test.rpm-test-0.1.0.jar", "Wrong installation path\n" + spec)
assert(spec contains "%config %attr(0755,root,root) /etc/init.d/rpm-package", "Wrong /etc/init.d path\n" + spec)
assert(spec contains "%config %attr(755,root,root) /etc/default/rpm-package", "Wrong /etc default file\n" + spec)
assert(spec contains "%config %attr(644,root,root) /etc/default/rpm-package", "Wrong /etc default file\n" + spec)
assert(spec contains "%dir %attr(755,rpm-package,rpm-package) /var/log/rpm-package", "Wrong logging dir path\n" + spec)
assert(spec contains "%dir %attr(755,rpm-package,rpm-package) /var/run/rpm-package", "Wrong /var/run dir path\n" + spec)
out.log.success("Successfully tested rpm-package file")
Expand Down