Merge branch 'deploy_command' into 'master'

Deploy page command

Merge branch 'deploy_command' into 'master'
Deploy page command
Jacob Vosmaer
2 parents b6896206 7112a9e7
Showing 3 changed files with 37 additions and 0 deletions Show diff stats
CHANGELOG
config/software/gitlab-ctl.rb
files/gitlab-ctl-commands/deploy_page.rb
@@ -20,6 +20,7 @@ omnibus-gitlab repository.
 - Make Runit log rotation configurable
 - Change default Runit log rotation from 10x1MB to 30x24h
 - Security: Restrict redis and postgresql log directory permissions to 0700
+- Add a 'gitlab-ctl deploy-page' command
  
 6.9.2
 - Create the authorized-keys.lock file for gitlab-shell 1.9.4
@@ -21,6 +21,8 @@ name &quot;gitlab-ctl&quot;
 dependency "rsync"
 dependency "omnibus-ctl"
  
+source :path => File.expand_path("files/gitlab-ctl-commands", Omnibus.project_root)
+
 build do
   block do
     open("#{install_dir}/bin/gitlab-ctl", "w") do |file|
@@ -61,4 +63,7 @@ done
   end
  
   command "chmod 755 #{install_dir}/bin/gitlab-ctl"
+
+  # additional omnibus-ctl commands
+  command "#{install_dir}/embedded/bin/rsync -a ./ #{install_dir}/embedded/service/omnibus-ctl/"
 end
@@ -0,0 +1,31 @@
+#
+# Copyright:: Copyright (c) 2014 GitLab B.V.
+# 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.
+#
+
+add_command 'deploy-page', 'Put up the deploy page', 2 do |cmd_name, state|
+  require 'fileutils'
+  deploy = File.join(base_path, 'embedded/service/gitlab-rails/public/deploy.html')
+  index = deploy.sub('deploy', 'index')
+
+  case state
+  when 'up'
+    FileUtils.cp(deploy, index, verbose: true)
+  when 'down'
+    FileUtils.rm_f(index, verbose: true)
+  else
+    puts "Usage: #{cmd_name} up|down"
+  end
+end
...	...	@@ -20,6 +20,7 @@ omnibus-gitlab repository.
20	20	- Make Runit log rotation configurable
21	21	- Change default Runit log rotation from 10x1MB to 30x24h
22	22	- Security: Restrict redis and postgresql log directory permissions to 0700
	23	+- Add a 'gitlab-ctl deploy-page' command
23	24
24	25	6.9.2
25	26	- Create the authorized-keys.lock file for gitlab-shell 1.9.4
...	...
...	...	@@ -21,6 +21,8 @@ name "gitlab-ctl"
21	21	dependency "rsync"
22	22	dependency "omnibus-ctl"
23	23
	24	+source :path => File.expand_path("files/gitlab-ctl-commands", Omnibus.project_root)
	25	+
24	26	build do
25	27	block do
26	28	open("#{install_dir}/bin/gitlab-ctl", "w") do \|file\|
...	...	@@ -61,4 +63,7 @@ done
61	63	end
62	64
63	65	command "chmod 755 #{install_dir}/bin/gitlab-ctl"
	66	+
	67	+ # additional omnibus-ctl commands
	68	+ command "#{install_dir}/embedded/bin/rsync -a ./ #{install_dir}/embedded/service/omnibus-ctl/"
64	69	end
...	...
...	...	@@ -0,0 +1,31 @@
	1	+#
	2	+# Copyright:: Copyright (c) 2014 GitLab B.V.
	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	+add_command 'deploy-page', 'Put up the deploy page', 2 do \|cmd_name, state\|
	19	+ require 'fileutils'
	20	+ deploy = File.join(base_path, 'embedded/service/gitlab-rails/public/deploy.html')
	21	+ index = deploy.sub('deploy', 'index')
	22	+
	23	+ case state
	24	+ when 'up'
	25	+ FileUtils.cp(deploy, index, verbose: true)
	26	+ when 'down'
	27	+ FileUtils.rm_f(index, verbose: true)
	28	+ else
	29	+ puts "Usage: #{cmd_name} up\|down"
	30	+ end
	31	+end
...	...