diff --git a/packaging/conf/000-establish-connection.rb b/packaging/conf/000-establish-connection.rb deleted file mode 100644 index e909da9235..0000000000 --- a/packaging/conf/000-establish-connection.rb +++ /dev/null @@ -1,32 +0,0 @@ -#-- copyright -# OpenProject is a project management system. -# Copyright (C) 2012-2015 the OpenProject Foundation (OPF) -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License version 3. -# -# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2013 Jean-Philippe Lang -# Copyright (C) 2010-2013 the ChiliProject Team -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# See doc/COPYRIGHT.rdoc for more details. -#++ - -# Force the usage of config/database.yml instead of DATABASE_URL. -# Used so that query parameters from the DATABASE_URL are correctly used (e.g. SSL settings). -config = YAML.load(ERB.new(File.read(Rails.root.join("config/database.yml"))).result)[Rails.env.to_s] -ActiveRecord::Base.establish_connection config diff --git a/packaging/setup b/packaging/setup index fa8bd128ec..ea55537af6 100755 --- a/packaging/setup +++ b/packaging/setup @@ -4,8 +4,6 @@ echo "ruby '2.1.6'" > Gemfile.local cp -f packaging/conf/configuration.yml config/configuration.yml sed -i "s|config.serve_static_files = false|config.serve_static_files = true|" config/environments/production.rb -cp -f packaging/conf/000-establish-connection.rb config/initializers/ - # Specific npmrc used for packaging cp -f packaging/.npmrc .npmrc