From owner-svn-ports-all@freebsd.org Tue Feb 4 20:34:58 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A8318233992; Tue, 4 Feb 2020 20:34:58 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48BxJf41DTz4Wjy; Tue, 4 Feb 2020 20:34:58 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 850041F871; Tue, 4 Feb 2020 20:34:58 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 014KYwK1094575; Tue, 4 Feb 2020 20:34:58 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 014KYwAN094573; Tue, 4 Feb 2020 20:34:58 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <202002042034.014KYwAN094573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Tue, 4 Feb 2020 20:34:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525233 - in head/www/gitlab-ce: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/www/gitlab-ce: . files X-SVN-Commit-Revision: 525233 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Feb 2020 20:34:58 -0000 Author: mfechner Date: Tue Feb 4 20:34:57 2020 New Revision: 525233 URL: https://svnweb.freebsd.org/changeset/ports/525233 Log: Use the standard RC system available in FreeBSD. This makes some commands like: service gitlab rcvar available. This is required by configuration management tools like Chef, Puppetm, Salt, Ansible and more. PR: 243860 Reported by: amendlik@gmail.com Modified: head/www/gitlab-ce/Makefile head/www/gitlab-ce/files/gitlab.in Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Tue Feb 4 18:34:03 2020 (r525232) +++ head/www/gitlab-ce/Makefile Tue Feb 4 20:34:57 2020 (r525233) @@ -3,7 +3,7 @@ PORTNAME= gitlab-ce PORTVERSION= 12.7.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org Modified: head/www/gitlab-ce/files/gitlab.in ============================================================================== --- head/www/gitlab-ce/files/gitlab.in Tue Feb 4 18:34:03 2020 (r525232) +++ head/www/gitlab-ce/files/gitlab.in Tue Feb 4 20:34:57 2020 (r525233) @@ -129,14 +129,14 @@ fi # Switch to the app_user if it is not he/she who is running the script. if [ "$USER" != "$app_user" ]; then # Regenerate the Gemfile.lock for all related products - echo "Regenerate Gitlab Gemfile.lock" + # echo "Regenerate Gitlab Gemfile.lock" rm -f "${app_root}"/Gemfile.lock if ! su -l root -c "cd ${app_root} && %%LOCALBASE%%/bin/bundle install --local --quiet"; then echo "Could not create Gemfile.lock for gitlab, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/" exit 1 fi chown git "${app_root}"/Gemfile.lock - echo "Regenerate Gitaly Gemfile.lock" + # echo "Regenerate Gitaly Gemfile.lock" rm -f "${gitaly_dir}"/ruby/Gemfile.lock if ! su -l root -c "cd ${gitaly_dir}/ruby && %%LOCALBASE%%/bin/bundle install --local --quiet"; then echo "Could not create Gemfile.lock for gitaly, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/" @@ -563,56 +563,6 @@ restart_gitlab(){ } -### Finally the input handling. - -case $gitlab_enable in - [yY][eE][sS]) - case "$1" in - start|quietstart|faststart) - start_gitlab - ;; - stop|faststop) - stop_gitlab - ;; - restart) - restart_gitlab - ;; - reload|force-reload) - reload_gitlab - ;; - status) - print_status - exit $gitlab_status - ;; - *) - echo "Usage: service gitlab {start|quietstart|faststop|stop|restart|reload|onestart|onestop|onerestart|onreload|status}" - exit 1 - ;; - esac - ;; - *) - case "$1" in - onestart) - start_gitlab - ;; - onestop) - stop_gitlab - ;; - onerestart) - restart_gitlab - ;; - onreload) - reload_gitlab - ;; - status) - print_status - exit $gitlab_status - ;; - *) - echo "Usage: service gitlab {start|quietstart|faststop|stop|restart|reload|onestart|onestop|onerestart|onreload|status}" - exit 1 - ;; - esac -esac +run_rc_command "$1" exit