Create cookbook definition for symlinked templates

Jacob Vosmaer
1 parent 13f2a507
Showing 2 changed files with 33 additions and 7 deletions Show diff stats
files/gitlab-cookbooks/gitlab/definitions/template_symlink.rb
files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
@@ -0,0 +1,31 @@
+#
+# Copyright:: Copyright (c) 2014 GitLab.com
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+define :template_symlink, :link_from => nil, :source => nil, :owner => nil, :group => nil, :mode => nil, :variables => nil, :notifies => nil do
+  template params[:name] do
+    source params[:source]
+    owner params[:owner]
+    group params:group]
+    mode params[:mode]
+    variables params[:variables]
+    notifies *params[:notifies] if params[:notifies]
+  end
+
+  link params[:link_from] do
+    to params[:name]
+  end
+end
@@ -56,9 +56,8 @@ link &quot;/opt/gitlab/embedded/service/gitlab-core/.secret&quot; do
   to secret_token_config
 end
-database_yml = File.join(gitlab_core_etc_dir, "database.yml")
-
-template database_yml do
+template_symlink File.join(gitlab_core_etc_dir, "database.yml") do
+  link_from "/opt/gitlab/embedded/service/gitlab-core/config/database.yml"
   source "database.yml.postgresql.erb"
   owner "root"
   group "root"
@@ -67,10 +66,6 @@ template database_yml do
   notifies :restart, 'service[gitlab-core]' if should_notify
 end
-link "/opt/gitlab/embedded/service/gitlab-core/config/database.yml" do
-  to database_yml
-end
-
 gitlab_yml = File.join(gitlab_core_etc_dir, "gitlab.yml")
 template gitlab_yml do
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+#
	2	+# Copyright:: Copyright (c) 2014 GitLab.com
	3	+# License:: Apache License, Version 2.0
	4	+#
	5	+# Licensed under the Apache License, Version 2.0 (the "License");
	6	+# you may not use this file except in compliance with the License.
	7	+# You may obtain a copy of the License at
	8	+#
	9	+# http://www.apache.org/licenses/LICENSE-2.0
	10	+#
	11	+# Unless required by applicable law or agreed to in writing, software
	12	+# distributed under the License is distributed on an "AS IS" BASIS,
	13	+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	14	+# See the License for the specific language governing permissions and
	15	+# limitations under the License.
	16	+#
	17	+
	18	+define :template_symlink, :link_from => nil, :source => nil, :owner => nil, :group => nil, :mode => nil, :variables => nil, :notifies => nil do
	19	+ template params[:name] do
	20	+ source params[:source]
	21	+ owner params[:owner]
	22	+ group params:group]
	23	+ mode params[:mode]
	24	+ variables params[:variables]
	25	+ notifies *params[:notifies] if params[:notifies]
	26	+ end
	27	+
	28	+ link params[:link_from] do
	29	+ to params[:name]
	30	+ end
	31	+end