Commit 4b7557fd720fc2609af55a68ac9b30e2bf821f8f
1 parent
7974a8ac
Exists in
master
and in
17 other branches
Remove stuff we do not need right now
Showing
1 changed file
with
4 additions
and
28 deletions
Show diff stats
files/gitlab-cookbooks/gitlab/recipes/default.rb
| @@ -26,30 +26,16 @@ directory "/etc/gitlab" do | @@ -26,30 +26,16 @@ directory "/etc/gitlab" do | ||
| 26 | action :nothing | 26 | action :nothing |
| 27 | end.run_action(:create) | 27 | end.run_action(:create) |
| 28 | 28 | ||
| 29 | -if File.exists?("/etc/gitlab/gitlab.json") | ||
| 30 | - Chef::Log.warn("Please move to /etc/gitlab/gitlab.rb for configuration - /etc/gitlab/gitlab.json is deprecated.") | ||
| 31 | -else | ||
| 32 | - GitLab[:node] = node | ||
| 33 | - if File.exists?("/etc/gitlab/gitlab.rb") | ||
| 34 | - GitLab.from_file("/etc/gitlab/gitlab.rb") | ||
| 35 | - end | ||
| 36 | - node.consume_attributes(GitLab.generate_config(node['fqdn'])) | 29 | +GitLab[:node] = node |
| 30 | +if File.exists?("/etc/gitlab/gitlab.rb") | ||
| 31 | + GitLab.from_file("/etc/gitlab/gitlab.rb") | ||
| 37 | end | 32 | end |
| 33 | +node.consume_attributes(GitLab.generate_config(node['fqdn'])) | ||
| 38 | 34 | ||
| 39 | if File.exists?("/var/opt/gitlab/bootstrapped") | 35 | if File.exists?("/var/opt/gitlab/bootstrapped") |
| 40 | node.set['gitlab']['bootstrap']['enable'] = false | 36 | node.set['gitlab']['bootstrap']['enable'] = false |
| 41 | end | 37 | end |
| 42 | 38 | ||
| 43 | -# Create the Chef User | ||
| 44 | -include_recipe "gitlab::users" | ||
| 45 | - | ||
| 46 | -directory "/etc/chef" do | ||
| 47 | - owner "root" | ||
| 48 | - group node['gitlab']['user']['username'] | ||
| 49 | - mode "0775" | ||
| 50 | - action :create | ||
| 51 | -end | ||
| 52 | - | ||
| 53 | directory "/var/opt/gitlab" do | 39 | directory "/var/opt/gitlab" do |
| 54 | owner "root" | 40 | owner "root" |
| 55 | group "root" | 41 | group "root" |
| @@ -63,15 +49,7 @@ include_recipe "runit" | @@ -63,15 +49,7 @@ include_recipe "runit" | ||
| 63 | 49 | ||
| 64 | # Configure Services | 50 | # Configure Services |
| 65 | [ | 51 | [ |
| 66 | - "rabbitmq", | ||
| 67 | "postgresql", | 52 | "postgresql", |
| 68 | - "chef-solr", | ||
| 69 | - "chef-expander", | ||
| 70 | - "bookshelf", | ||
| 71 | - "erchef", | ||
| 72 | - "bootstrap", | ||
| 73 | - "gitlab-webui", | ||
| 74 | - "nginx" | ||
| 75 | ].each do |service| | 53 | ].each do |service| |
| 76 | if node["gitlab"][service]["enable"] | 54 | if node["gitlab"][service]["enable"] |
| 77 | include_recipe "gitlab::#{service}" | 55 | include_recipe "gitlab::#{service}" |
| @@ -80,8 +58,6 @@ include_recipe "runit" | @@ -80,8 +58,6 @@ include_recipe "runit" | ||
| 80 | end | 58 | end |
| 81 | end | 59 | end |
| 82 | 60 | ||
| 83 | -include_recipe "gitlab::chef-pedant" | ||
| 84 | - | ||
| 85 | file "/etc/gitlab/gitlab-running.json" do | 61 | file "/etc/gitlab/gitlab-running.json" do |
| 86 | owner node['gitlab']['user']['username'] | 62 | owner node['gitlab']['user']['username'] |
| 87 | group "root" | 63 | group "root" |