Merge pull request #1241 from habitat-sh/jtimberman/static-owned-by-hab

Static directory permissions
habitat-sh · Sep 15, 2016 · 7d2dccb · 7d2dccb
2 parents 56b8ddd + 78a918e
commit 7d2dccb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/components/builder-api/habitat/hooks/init b/components/builder-api/habitat/hooks/init
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-ln -sf {{pkg.path}}/static {{pkg.svc_path}}
-rm -df {{pkg.svc_static_path}}/habitat.conf.js
+cp -a {{pkg.path}}/static/* {{pkg.svc_static_path}}
+rm -f {{pkg.svc_static_path}}/habitat.conf.js
 ln -sf {{pkg.svc_config_path}}/habitat.conf.js {{pkg.svc_static_path}}/habitat.conf.js
diff --git a/components/sup/src/package/mod.rs b/components/sup/src/package/mod.rs
@@ -188,6 +188,9 @@ impl Package {
         try!(Self::create_dir_all(self.pkg_install.svc_var_path()));
         try!(util::perm::set_owner(self.pkg_install.svc_var_path(), &user, &group));
         try!(util::perm::set_permissions(self.pkg_install.svc_var_path(), 0o700));
+        try!(Self::create_dir_all(self.pkg_install.svc_static_path()));
+        try!(util::perm::set_owner(self.pkg_install.svc_static_path(), &user, &group));
+        try!(util::perm::set_permissions(self.pkg_install.svc_static_path(), 0o700));
         // TODO: Not 100% if this directory is still needed, but for the moment it's still here -
         // FIN
         try!(Self::create_dir_all(self.pkg_install.svc_path().join("toml")));