diff options
| author |   Michael Lando <ml636r@att.com> | 2017-08-07 07:05:40 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-08-07 07:05:40 +0300 |
| commit | b2c60183d5d654b945a24ec5564807e4f691c6e8 (patch) | |
| tree | d6cdc354fa7ce27ea1e0ce60e6c57aa7c1ef20b6 /sdc-os-chef/sdc-frontend | |
| parent | d1d771bed17c6a5beea19af8da0bf9113972f25a (diff) | |
[SDC] code sync
Change-Id: I576dd69504722c341b0f41a1f6232ed3f4bee8df
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'sdc-os-chef/sdc-frontend')
3 files changed, 9 insertions, 1 deletions
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore Binary files differnew file mode 100644 index 0000000000..08f6cda8a7 --- /dev/null +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_locate_keystore.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_locate_keystore.rb new file mode 100644 index 0000000000..91a819adfe --- /dev/null +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_locate_keystore.rb @@ -0,0 +1,7 @@ +jetty_base="/var/lib/jetty" +cookbook_file "/#{jetty_base}/etc/keystore" do + source "keystore" + owner "jetty" + group "jetty" + mode 0755 +end diff --git a/sdc-os-chef/sdc-frontend/chef-solo/roles/catalog-fe.json b/sdc-os-chef/sdc-frontend/chef-solo/roles/catalog-fe.json index 9e023762d1..63b55aa712 100644 --- a/sdc-os-chef/sdc-frontend/chef-solo/roles/catalog-fe.json +++ b/sdc-os-chef/sdc-frontend/chef-solo/roles/catalog-fe.json @@ -15,7 +15,8 @@ "recipe[sdc-catalog-fe::FE_3_errors_config]", "recipe[sdc-catalog-fe::FE_4_logback]", "recipe[sdc-catalog-fe::FE_5_rest_configuration]", - "recipe[sdc-catalog-fe::FE_6_create_jetty_modules]" + "recipe[sdc-catalog-fe::FE_6_create_jetty_modules]", + "recipe[sdc-catalog-fe::FE_7_locate_keystore]" ], "env_run_lists": { } |