diff options
Diffstat (limited to 'assets/gitlab-rb-location.patch')
| -rwxr-xr-x | assets/gitlab-rb-location.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/assets/gitlab-rb-location.patch b/assets/gitlab-rb-location.patch new file mode 100755 index 0000000..4e39788 --- /dev/null +++ b/assets/gitlab-rb-location.patch @@ -0,0 +1,87 @@ +# ============LICENSE_START======================================================= +# org.onap.vvp/gitlab +# =================================================================== +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the “License”); +# you may not use this software 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. +# +# +# +# Unless otherwise specified, all documentation contained herein is licensed +# under the Creative Commons License, Attribution 4.0 Intl. (the “License”); +# you may not use this documentation except in compliance with the License. +# You may obtain a copy of the License at +# +# https://creativecommons.org/licenses/by/4.0/ +# +# Unless required by applicable law or agreed to in writing, documentation +# 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. +# +# ============LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +--- etc/gitlab.rb.template.bak 2015-09-22 20:55:42.088202003 +0000 ++++ etc/gitlab.rb.template 2015-09-22 20:55:50.888202003 +0000 +@@ -8,7 +8,7 @@ + ## Url on which GitLab will be reachable. + ## For more details on configuring external_url see: + ## https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/configuration.md#configuring-the-external-url-for-gitlab +-external_url 'GENERATED_EXTERNAL_URL' ++# external_url 'GENERATED_EXTERNAL_URL' # default: http://hostname + + + ## Note: configuration settings below are optional. +--- embedded/cookbooks/gitlab.bak/recipes/remove_accounts.rb 2015-09-22 20:50:46.964202003 +0000 ++++ embedded/cookbooks/gitlab/recipes/remove_accounts.rb 2015-09-22 20:51:49.256202003 +0000 +@@ -16,8 +16,8 @@ + # + + Gitlab[:node] = node +-if File.exists?("/etc/gitlab/gitlab.rb") +- Gitlab.from_file("/etc/gitlab/gitlab.rb") ++if File.exists?("/assets/gitlab.rb") ++ Gitlab.from_file("/assets/gitlab.rb") + end + node.consume_attributes(Gitlab.generate_config(node['fqdn'])) + +--- embedded/cookbooks/gitlab.bak/recipes/show_config.rb 2015-09-22 20:50:46.964202003 +0000 ++++ embedded/cookbooks/gitlab/recipes/show_config.rb 2015-09-22 20:52:02.716202003 +0000 +@@ -16,9 +16,9 @@ + # limitations under the License. + # + +-if File.exists?("/etc/gitlab/gitlab.rb") ++if File.exists?("/assets/gitlab.rb") + Gitlab[:node] = node +- Gitlab.from_file("/etc/gitlab/gitlab.rb") ++ Gitlab.from_file("/assets/gitlab.rb") + end + config = Gitlab.generate_config(node['fqdn']) + +--- embedded/cookbooks/gitlab.bak/recipes/default.rb 2015-09-22 20:50:46.964202003 +0000 ++++ embedded/cookbooks/gitlab/recipes/default.rb 2015-09-22 20:52:13.880202003 +0000 +@@ -31,8 +31,8 @@ + end.run_action(:create) + + Gitlab[:node] = node +-if File.exists?("/etc/gitlab/gitlab.rb") +- Gitlab.from_file("/etc/gitlab/gitlab.rb") ++if File.exists?("/assets/gitlab.rb") ++ Gitlab.from_file("/assets/gitlab.rb") + end + node.consume_attributes(Gitlab.generate_config(node['fqdn'])) |