From a110670cf9cf68965a2305d5338fdf5ea360ddce Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 10 Feb 2014 14:53:20 +0100 Subject: [PATCH] Rename runit templates for new unicorn service --- files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-core-log-run.erb | 2 -- files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-core-run.erb | 6 ------ files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-log-run.erb | 2 ++ files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-run.erb | 6 ++++++ 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-core-log-run.erb delete mode 100644 files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-core-run.erb create mode 100644 files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-log-run.erb create mode 100644 files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-run.erb diff --git a/files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-core-log-run.erb b/files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-core-log-run.erb deleted file mode 100644 index c8ab3e3..0000000 --- a/files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-core-log-run.erb +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec svlogd -tt <%= @options[:log_directory] %> diff --git a/files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-core-run.erb b/files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-core-run.erb deleted file mode 100644 index 161789a..0000000 --- a/files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-core-run.erb +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -cd /opt/gitlab/embedded/service/gitlab-core - -exec 2>&1 -exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env HOME="<%= node['gitlab']['gitlab-core']['dir'] %>" /opt/gitlab/embedded/bin/bundle exec unicorn -E <%= node['gitlab']['gitlab-core']['environment'] %> -c <%= File.join(node['gitlab']['gitlab-core']['dir'], "etc", "unicorn.rb") %> /opt/gitlab/embedded/service/gitlab-core/config.ru diff --git a/files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-log-run.erb b/files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-log-run.erb new file mode 100644 index 0000000..c8ab3e3 --- /dev/null +++ b/files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-log-run.erb @@ -0,0 +1,2 @@ +#!/bin/sh +exec svlogd -tt <%= @options[:log_directory] %> diff --git a/files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-run.erb b/files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-run.erb new file mode 100644 index 0000000..161789a --- /dev/null +++ b/files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-run.erb @@ -0,0 +1,6 @@ +#!/bin/sh + +cd /opt/gitlab/embedded/service/gitlab-core + +exec 2>&1 +exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env HOME="<%= node['gitlab']['gitlab-core']['dir'] %>" /opt/gitlab/embedded/bin/bundle exec unicorn -E <%= node['gitlab']['gitlab-core']['environment'] %> -c <%= File.join(node['gitlab']['gitlab-core']['dir'], "etc", "unicorn.rb") %> /opt/gitlab/embedded/service/gitlab-core/config.ru -- libgit2 0.21.2