From 6a9a77da46323f915966fbbe6f3380a201f9c9d4 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 19 Feb 2014 18:49:05 +0100 Subject: [PATCH] deleted old ebuilds. I will also delete the ebuild for gitlabhq-6.5.1 as soon as cvut's overlay (https://github.com/cvut/gentoo-overlay) has fixed the digests on the available gitlabhq ebuilds. --- .../files/gitlabhq-6.4.3-fix-gemfile.patch | 84 ---- ...itlabhq-6.4.3-fix-project-name-regex.patch | 28 -- .../gitlabhq-6.4.3-fix-sendmail-config.patch | 20 - .../files/gitlabhq-6.5.0-fix-gemfile.patch | 84 ---- .../gitlabhq-6.5.0-fix-login-over-ssl.patch | 11 - ...itlabhq-6.5.0-fix-project-name-regex.patch | 28 -- .../gitlabhq-6.5.0-fix-sendmail-config.patch | 20 - www-apps/gitlabhq/gitlabhq-6.4.3.ebuild | 364 ----------------- www-apps/gitlabhq/gitlabhq-6.5.0.ebuild | 365 ------------------ 9 files changed, 1004 deletions(-) delete mode 100644 www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-gemfile.patch delete mode 100644 www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-project-name-regex.patch delete mode 100644 www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-sendmail-config.patch delete mode 100644 www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-gemfile.patch delete mode 100644 www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-login-over-ssl.patch delete mode 100644 www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-project-name-regex.patch delete mode 100644 www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-sendmail-config.patch delete mode 100644 www-apps/gitlabhq/gitlabhq-6.4.3.ebuild delete mode 100644 www-apps/gitlabhq/gitlabhq-6.5.0.ebuild diff --git a/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-gemfile.patch b/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-gemfile.patch deleted file mode 100644 index 9571f70..0000000 --- a/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-gemfile.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- Gemfile.orig 2014-01-17 17:27:47.960000000 +0100 -+++ Gemfile 2014-01-17 17:28:20.620000000 +0100 -@@ -134,13 +134,16 @@ - # Sanitize user input - gem "sanitize" - -+# The newer revision of charlock_holmes that is finally fixed to -+# be compatible with Gentoo -+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4" -+ - # Protect against bruteforcing - gem "rack-attack" - - gem "sass-rails" - gem "coffee-rails" - gem "uglifier" --gem "therubyracer" - gem 'turbolinks' - gem 'jquery-turbolinks' - ---- Gemfile.lock.orig 2014-01-17 17:29:53.490000000 +0100 -+++ Gemfile.lock 2014-01-17 17:33:01.660000000 +0100 -@@ -1,4 +1,11 @@ - GIT -+ remote: https://github.com/brianmario/charlock_holmes.git -+ revision: dde194609b3513b0d2369ce8f916ae52566154b4 -+ ref: dde194609b3513b0d2369ce8f916ae52566154b4 -+ specs: -+ charlock_holmes (0.6.9.4) -+ -+GIT - remote: https://github.com/gitlabhq/gon.git - revision: 58ca8e17273051cb370182cabd3602d1da6783ab - ref: 58ca8e17273051cb370182cabd3602d1da6783ab -@@ -72,7 +79,6 @@ - json (>= 1.7) - celluloid (0.15.2) - timers (~> 1.1.0) -- charlock_holmes (0.6.9.4) - chosen-rails (1.0.1) - coffee-rails (>= 3.2) - compass-rails (>= 1.0) -@@ -278,7 +284,6 @@ - addressable (~> 2.3) - letter_opener (1.1.2) - launchy (~> 2.2) -- libv8 (3.16.14.3) - listen (2.3.1) - celluloid (>= 0.15.2) - rb-fsevent (>= 0.9.3) -@@ -412,7 +417,6 @@ - redis-store (~> 1.1.0) - redis-store (1.1.4) - redis (>= 2.2) -- ref (1.0.5) - require_all (1.3.2) - rest-client (1.6.7) - mime-types (>= 1.16) -@@ -499,9 +503,6 @@ - term-ansicolor (1.2.2) - tins (~> 0.8) - test_after_commit (0.2.2) -- therubyracer (0.12.0) -- libv8 (~> 3.16.14.0) -- ref - thin (1.6.1) - daemons (>= 1.0.9) - eventmachine (>= 1.0.0) -@@ -572,6 +573,7 @@ - bootstrap-sass (~> 2.3) - capybara - carrierwave -+ charlock_holmes! - chosen-rails (= 1.0.1) - coffee-rails - colored -@@ -655,7 +657,6 @@ - stamp - state_machine - test_after_commit -- therubyracer - thin - tinder (~> 1.9.2) - turbolinks diff --git a/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-project-name-regex.patch b/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-project-name-regex.patch deleted file mode 100644 index e0c7fa3..0000000 --- a/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-project-name-regex.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- lib/gitlab/regex.rb.orig 2013-12-23 19:43:59.000000000 +0100 -+++ lib/gitlab/regex.rb 2014-01-17 17:43:00.020000000 +0100 -@@ -1,3 +1,5 @@ -+# encoding: utf-8 -+ - module Gitlab - module Regex - extend self -@@ -7,7 +9,7 @@ - end - - def project_name_regex -- /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/ -+ /\A\p{Word}[\p{Word}\-:\. ]*\z/ - end - - def name_regex ---- app/models/project.rb.orig 2014-01-17 17:40:02.050000000 +0100 -+++ app/models/project.rb 2014-01-17 17:44:09.150000000 +0100 -@@ -85,7 +85,7 @@ - validates :description, length: { maximum: 2000 }, allow_blank: true - validates :name, presence: true, length: { within: 0..255 }, - format: { with: Gitlab::Regex.project_name_regex, -- message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter or digit should be first" } -+ message: "only letters, digits, spaces & '_' '-' '.' ':' allowed. Letter or digit should be first" } - validates :path, presence: true, length: { within: 0..255 }, - exclusion: { in: Gitlab::Blacklist.path }, - format: { with: Gitlab::Regex.path_regex, diff --git a/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-sendmail-config.patch b/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-sendmail-config.patch deleted file mode 100644 index 0a6e8d9..0000000 --- a/www-apps/gitlabhq/files/gitlabhq-6.4.3-fix-sendmail-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/config/environments/production.rb b/gitlab-6/environments/production.rb -index 82eb250..10e25e5 100644 ---- a/config/environments/production.rb -+++ b/config/environments/production.rb -@@ -73,11 +73,10 @@ Gitlab::Application.configure do - # config.active_record.auto_explain_threshold_in_seconds = 0.5 - - config.action_mailer.delivery_method = :sendmail -- # Defaults to: -- # # config.action_mailer.sendmail_settings = { -- # # location: '/usr/sbin/sendmail', -- # # arguments: '-i -t' -- # # } -+ config.action_mailer.sendmail_settings = { -+ location: '/usr/sbin/sendmail', -+ arguments: '-i' -+ } - config.action_mailer.perform_deliveries = true - config.action_mailer.raise_delivery_errors = true - end diff --git a/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-gemfile.patch b/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-gemfile.patch deleted file mode 100644 index dba7d4a..0000000 --- a/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-gemfile.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- Gemfile.orig 2014-01-22 14:39:19.620000000 +0100 -+++ Gemfile 2014-01-22 14:40:24.120000000 +0100 -@@ -137,13 +137,16 @@ - # Sanitize user input - gem "sanitize" - -+# The newer revision of charlock_holmes that is finally fixed to -+# be compatible with Gentoo -+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4" -+ - # Protect against bruteforcing - gem "rack-attack" - - gem "sass-rails" - gem "coffee-rails" - gem "uglifier" --gem "therubyracer" - gem 'turbolinks' - gem 'jquery-turbolinks' - ---- Gemfile.lock.orig 2014-01-22 14:40:35.780000000 +0100 -+++ Gemfile.lock 2014-01-22 14:52:42.590000000 +0100 -@@ -1,4 +1,11 @@ - GIT -+ remote: https://github.com/brianmario/charlock_holmes.git -+ revision: dde194609b3513b0d2369ce8f916ae52566154b4 -+ ref: dde194609b3513b0d2369ce8f916ae52566154b4 -+ specs: -+ charlock_holmes (0.6.9.4) -+ -+GIT - remote: https://github.com/gitlabhq/markup.git - revision: 61ade389c1e1c159359338f570d18464a44ddbc4 - ref: 61ade389c1e1c159359338f570d18464a44ddbc4 -@@ -70,7 +77,6 @@ - json (>= 1.7) - celluloid (0.15.2) - timers (~> 1.1.0) -- charlock_holmes (0.6.9.4) - cliver (0.2.2) - code_analyzer (0.4.3) - sexp_processor -@@ -267,7 +273,6 @@ - addressable (~> 2.3) - letter_opener (1.1.2) - launchy (~> 2.2) -- libv8 (3.16.14.3) - listen (2.3.1) - celluloid (>= 0.15.2) - rb-fsevent (>= 0.9.3) -@@ -401,7 +406,6 @@ - redis-store (~> 1.1.0) - redis-store (1.1.4) - redis (>= 2.2) -- ref (1.0.5) - require_all (1.3.2) - rest-client (1.6.7) - mime-types (>= 1.16) -@@ -488,9 +492,6 @@ - term-ansicolor (1.2.2) - tins (~> 0.8) - test_after_commit (0.2.2) -- therubyracer (0.12.0) -- libv8 (~> 3.16.14.0) -- ref - thin (1.6.1) - daemons (>= 1.0.9) - eventmachine (>= 1.0.0) -@@ -561,6 +562,7 @@ - bootstrap-sass (~> 3.0) - capybara - carrierwave -+ charlock_holmes! - coffee-rails - colored - coveralls -@@ -644,7 +646,6 @@ - stamp - state_machine - test_after_commit -- therubyracer - thin - tinder (~> 1.9.2) - turbolinks diff --git a/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-login-over-ssl.patch b/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-login-over-ssl.patch deleted file mode 100644 index bed532a..0000000 --- a/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-login-over-ssl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- config/initializers/session_store.rb.broken 2014-01-22 22:15:38.530000000 +0100 -+++ config/initializers/session_store.rb 2014-01-22 22:06:53.020000000 +0100 -@@ -4,7 +4,7 @@ - :redis_store, # Using the cookie_store would enable session replay attacks. - servers: Gitlab::Application.config.cache_store.last, # re-use the Redis config from the Rails cache store - key: '_gitlab_session', -- secure: Gitlab.config.gitlab.https, -+ secure: Gitlab::Application.config.force_ssl, - httponly: true, - path: (Rails.application.config.relative_url_root.nil?) ? '/' : Rails.application.config.relative_url_root - ) diff --git a/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-project-name-regex.patch b/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-project-name-regex.patch deleted file mode 100644 index e0c7fa3..0000000 --- a/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-project-name-regex.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- lib/gitlab/regex.rb.orig 2013-12-23 19:43:59.000000000 +0100 -+++ lib/gitlab/regex.rb 2014-01-17 17:43:00.020000000 +0100 -@@ -1,3 +1,5 @@ -+# encoding: utf-8 -+ - module Gitlab - module Regex - extend self -@@ -7,7 +9,7 @@ - end - - def project_name_regex -- /\A[a-zA-Z0-9][a-zA-Z0-9_\-\. ]*\z/ -+ /\A\p{Word}[\p{Word}\-:\. ]*\z/ - end - - def name_regex ---- app/models/project.rb.orig 2014-01-17 17:40:02.050000000 +0100 -+++ app/models/project.rb 2014-01-17 17:44:09.150000000 +0100 -@@ -85,7 +85,7 @@ - validates :description, length: { maximum: 2000 }, allow_blank: true - validates :name, presence: true, length: { within: 0..255 }, - format: { with: Gitlab::Regex.project_name_regex, -- message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter or digit should be first" } -+ message: "only letters, digits, spaces & '_' '-' '.' ':' allowed. Letter or digit should be first" } - validates :path, presence: true, length: { within: 0..255 }, - exclusion: { in: Gitlab::Blacklist.path }, - format: { with: Gitlab::Regex.path_regex, diff --git a/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-sendmail-config.patch b/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-sendmail-config.patch deleted file mode 100644 index 0a6e8d9..0000000 --- a/www-apps/gitlabhq/files/gitlabhq-6.5.0-fix-sendmail-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/config/environments/production.rb b/gitlab-6/environments/production.rb -index 82eb250..10e25e5 100644 ---- a/config/environments/production.rb -+++ b/config/environments/production.rb -@@ -73,11 +73,10 @@ Gitlab::Application.configure do - # config.active_record.auto_explain_threshold_in_seconds = 0.5 - - config.action_mailer.delivery_method = :sendmail -- # Defaults to: -- # # config.action_mailer.sendmail_settings = { -- # # location: '/usr/sbin/sendmail', -- # # arguments: '-i -t' -- # # } -+ config.action_mailer.sendmail_settings = { -+ location: '/usr/sbin/sendmail', -+ arguments: '-i' -+ } - config.action_mailer.perform_deliveries = true - config.action_mailer.raise_delivery_errors = true - end diff --git a/www-apps/gitlabhq/gitlabhq-6.4.3.ebuild b/www-apps/gitlabhq/gitlabhq-6.4.3.ebuild deleted file mode 100644 index f0cf83c..0000000 --- a/www-apps/gitlabhq/gitlabhq-6.4.3.ebuild +++ /dev/null @@ -1,364 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -# Mainteiner notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby19 ruby20" -PYTHON_DEPEND="2:2.7" - -inherit eutils python ruby-ng - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://github.com/gitlabhq/gitlabhq" -SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="6" -KEYWORDS="~amd64 ~x86" -IUSE="mysql +postgres +unicorn" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql-base -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( dev-db/postgresql-base ) - mysql? ( virtual/mysql )" -DEPEND="${GEMS_DEPEND} - >=dev-vcs/gitlab-shell-1.8 - dev-vcs/git" -RDEPEND="${DEPEND} - dev-db/redis - virtual/mta" -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.0" - -# -# fix-gemfile: -# Remove therubyracer that doesn't compile well on Gentoo (we're using -# nodejs instead that is faster and better). Also replace broken -# charlock_holmes version with fixed one. -# -# fix-project-name-regex: -# Allow project name to contain non-ASCII characters. -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# -RUBY_PATCHES=( - "${P}-fix-gemfile.patch" - "${P}-fix-project-name-regex.patch" - "${P}-fix-sendmail-config.patch" -) - -MY_NAME="gitlab" -MY_USER="git" # should be same as in gitlab-shell - -DEST_DIR="/opt/${MY_NAME}-${SLOT}" -CONF_DIR="/etc/${MY_NAME}-${SLOT}" -LOGS_DIR="/var/log/${MY_NAME}" -TEMP_DIR="/var/tmp/${MY_NAME}" - -# When updating ebuild to newer version, check list of the queues in -# https://github.com/gitlabhq/gitlabhq/blob/${PV}/lib/tasks/sidekiq.rake -# TODO fritteli: I don't know what to look for in that file ... so I left this unchanged from gitlabhq-6.0.2-r2.ebuild -SIDEKIQ_QUEUES="post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default" - -all_ruby_prepare() { - - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local hooks_path=/usr/share/gitlab-shell/hooks - sed -i -E \ - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${hooks_path}/|" \ - config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - - local run_path=/run/${MY_NAME} - sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|/run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove zzet's stupid migration which expetcs that users are so foolish - # to run GitLab with PostgreSQL's superuser... - rm db/migrate/20121009205010_postgres_create_integer_cast.rb - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} ${temp}/repo_satellites - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - insinto ${dest} - doins -r ./ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} - fperms +x script/{rails,check} - - ## RC script ## - - local rcscript=gitlab-sidekiq.init - use unicorn && rcscript=gitlab-unicorn-6.init - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@SLOT@|${SLOT}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ - -e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}-${SLOT}" -} - -pkg_postinst() { - elog - elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml." - elog - elog "2. Configure your database settings in ${CONF_DIR}/database.yml" - elog " for \"production\" environment." - elog - elog "3. Then you should create a database for your GitLab instance, if you" - elog "haven't done so already." - elog - if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab gitlabhq_production" - elog " Note: You should change your password to something more random..." - elog - fi - elog "4. Finally execute the following command to initlize environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If this is an update from previous version, it's HIGHLY recommended" - elog "to backup your database before running the config phase!" -} - -pkg_config() { - local shell_conf='/etc/gitlab-shell.yml' - - einfo "Checking configuration files" - - if [ ! -r "${CONF_DIR}/database.yml" ]; then - eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" - eerror "database settings for \"production\" environment."; die - fi - - # check gitlab-shell configuration - if [ -r ${shell_conf} ]; then - local shell_repos_path="$(ryaml ${shell_conf} repos_path)" - local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \ - production gitlab_shell repos_path)" - - if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then - eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}" - eerror "must points to the same location! Fix the repos_path location and" - eerror "run this again."; die - fi - else - ewarn "GitLab Shell checks skipped, could not find config file at" - ewarn "${shell_conf}. Make sure that you have gitlab-shell properly" - ewarn "installed and that repos_path is the same as in GitLab." - fi - - local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)" - local git_home=$(getent passwd ${MY_USER} | cut -d: -f6) - - # configure Git global settings - if [ ! -e "${git_home}/.gitconfig" ]; then - einfo "Setting git user" - su -l ${MY_USER} -c " - git config --global user.email '${email_from}'; - git config --global user.name 'GitLab'" \ - || die "failed to setup git name and email" - fi - - if [ ! -d "${DEST_DIR}/.git" ]; then - # create dummy git repo as workaround for - # https://github.com/bundler/bundler/issues/2039 - einfo "Initializing dummy git repository to avoid false errors from bundler" - su -l ${MY_USER} -c " - cd ${DEST_DIR} - git init - git add README.md - git commit -m 'Dummy repository'" >/dev/null - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - local update= - while [ ! -n "${update}" ] ; do - echo - echo " Is this an update from previous version (fresh install otherwise)? (y/n)" - read answer - if [[ ${answer} =~ ^[Yy]([Ee][Ss])?$ ]]; then - update=true - elif [[ ${answer} =~ ^[Nn]([Oo])?$ ]]; then - update=false - else - echo "Answer not recognized" - fi - done - - if [ "${update}" = 'true' ]; then - einfo "Migrating database ..." - exec_rake db:migrate - - einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - else - einfo "Initializing database ..." - exec_rake gitlab:setup - fi - - einfo "Precompiling assests ..." - exec_rake assets:precompile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - fi -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -} diff --git a/www-apps/gitlabhq/gitlabhq-6.5.0.ebuild b/www-apps/gitlabhq/gitlabhq-6.5.0.ebuild deleted file mode 100644 index 146ebfe..0000000 --- a/www-apps/gitlabhq/gitlabhq-6.5.0.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -# Mainteiner notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby19 ruby20" -PYTHON_DEPEND="2:2.7" - -inherit eutils python ruby-ng - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://github.com/gitlabhq/gitlabhq" -SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="6" -KEYWORDS="~amd64 ~x86" -IUSE="mysql +postgres +unicorn" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql-base -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( dev-db/postgresql-base ) - mysql? ( virtual/mysql )" -DEPEND="${GEMS_DEPEND} - >=dev-vcs/gitlab-shell-1.8 - dev-vcs/git" -RDEPEND="${DEPEND} - dev-db/redis - virtual/mta" -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.0" - -# -# fix-gemfile: -# Remove therubyracer that doesn't compile well on Gentoo (we're using -# nodejs instead that is faster and better). Also replace broken -# charlock_holmes version with fixed one. -# -# fix-project-name-regex: -# Allow project name to contain non-ASCII characters. -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# -RUBY_PATCHES=( - "${P}-fix-gemfile.patch" - "${P}-fix-project-name-regex.patch" - "${P}-fix-sendmail-config.patch" - "${P}-fix-login-over-ssl.patch" -) - -MY_NAME="gitlab" -MY_USER="git" # should be same as in gitlab-shell - -DEST_DIR="/opt/${MY_NAME}-${SLOT}" -CONF_DIR="/etc/${MY_NAME}-${SLOT}" -LOGS_DIR="/var/log/${MY_NAME}" -TEMP_DIR="/var/tmp/${MY_NAME}" - -# When updating ebuild to newer version, check list of the queues in -# https://github.com/gitlabhq/gitlabhq/blob/${PV}/lib/tasks/sidekiq.rake -# TODO fritteli: I don't know what to look for in that file ... so I left this unchanged from gitlabhq-6.0.2-r2.ebuild -SIDEKIQ_QUEUES="post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default" - -all_ruby_prepare() { - - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local hooks_path=/usr/share/gitlab-shell/hooks - sed -i -E \ - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${hooks_path}/|" \ - config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - - local run_path=/run/${MY_NAME} - sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|/run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove zzet's stupid migration which expetcs that users are so foolish - # to run GitLab with PostgreSQL's superuser... - rm db/migrate/20121009205010_postgres_create_integer_cast.rb - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} ${temp}/repo_satellites - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - insinto ${dest} - doins -r ./ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} - fperms +x script/{rails,check} - - ## RC script ## - - local rcscript=gitlab-sidekiq.init - use unicorn && rcscript=gitlab-unicorn-6.init - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@SLOT@|${SLOT}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ - -e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}-${SLOT}" -} - -pkg_postinst() { - elog - elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml." - elog - elog "2. Configure your database settings in ${CONF_DIR}/database.yml" - elog " for \"production\" environment." - elog - elog "3. Then you should create a database for your GitLab instance, if you" - elog "haven't done so already." - elog - if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab gitlabhq_production" - elog " Note: You should change your password to something more random..." - elog - fi - elog "4. Finally execute the following command to initlize environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If this is an update from previous version, it's HIGHLY recommended" - elog "to backup your database before running the config phase!" -} - -pkg_config() { - local shell_conf='/etc/gitlab-shell.yml' - - einfo "Checking configuration files" - - if [ ! -r "${CONF_DIR}/database.yml" ]; then - eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" - eerror "database settings for \"production\" environment."; die - fi - - # check gitlab-shell configuration - if [ -r ${shell_conf} ]; then - local shell_repos_path="$(ryaml ${shell_conf} repos_path)" - local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \ - production gitlab_shell repos_path)" - - if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then - eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}" - eerror "must points to the same location! Fix the repos_path location and" - eerror "run this again."; die - fi - else - ewarn "GitLab Shell checks skipped, could not find config file at" - ewarn "${shell_conf}. Make sure that you have gitlab-shell properly" - ewarn "installed and that repos_path is the same as in GitLab." - fi - - local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)" - local git_home=$(getent passwd ${MY_USER} | cut -d: -f6) - - # configure Git global settings - if [ ! -e "${git_home}/.gitconfig" ]; then - einfo "Setting git user" - su -l ${MY_USER} -c " - git config --global user.email '${email_from}'; - git config --global user.name 'GitLab'" \ - || die "failed to setup git name and email" - fi - - if [ ! -d "${DEST_DIR}/.git" ]; then - # create dummy git repo as workaround for - # https://github.com/bundler/bundler/issues/2039 - einfo "Initializing dummy git repository to avoid false errors from bundler" - su -l ${MY_USER} -c " - cd ${DEST_DIR} - git init - git add README.md - git commit -m 'Dummy repository'" >/dev/null - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - local update= - while [ ! -n "${update}" ] ; do - echo - echo " Is this an update from previous version (fresh install otherwise)? (y/n)" - read answer - if [[ ${answer} =~ ^[Yy]([Ee][Ss])?$ ]]; then - update=true - elif [[ ${answer} =~ ^[Nn]([Oo])?$ ]]; then - update=false - else - echo "Answer not recognized" - fi - done - - if [ "${update}" = 'true' ]; then - einfo "Migrating database ..." - exec_rake db:migrate - - einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - else - einfo "Initializing database ..." - exec_rake gitlab:setup - fi - - einfo "Precompiling assests ..." - exec_rake assets:precompile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - fi -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -}