Attachment 168706 Details for Bug 208135 – Extended patch + fixes logfile location

[patch] Extended patch + fixes logfile location

gitlab-shell.patch (text/plain), 2.66 KB, created by Dmitry Marakasov on 2016-03-27 21:53:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2016-03-27 21:53:25 UTC

Size: 2.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 412011)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	gitlab-shell
> PORTVERSION=	2.6.10
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://ports.toco-domains.de/
> DISTNAME=	${PORTNAME}-v${PORTVERSION}
>@@ -19,13 +20,12 @@
> NO_BUILD=	yes
> NO_ARCH=	yes
> 
>-do-install:
>+post-patch:
> 	${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample
> 
>-post-install:
>-	${MKDIR} ${STAGEDIR}/var/log/
>-	${TOUCH} ${STAGEDIR}/var/log/gitlab-shell.log
>-	${MKDIR} ${STAGEDIR}${DATADIR}
>+do-install:
>+	@${MKDIR} ${STAGEDIR}${DATADIR}
> 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
>+	@${MKDIR} ${STAGEDIR}/var/log/gitlab-shell
> 
> .include <bsd.port.mk>
>Index: files/patch-config.yml.example
>===================================================================
>--- files/patch-config.yml.example	(revision 412011)
>+++ files/patch-config.yml.example	(working copy)
>@@ -5,7 +5,7 @@
>  # Log file.
>  # Default is gitlab-shell.log in the root directory.
> -# log_file: "/home/git/gitlab-shell/gitlab-shell.log"
>-+log_file: "/var/log/gitlab-shell.log"
>++log_file: "/var/log/gitlab-shell/gitlab-shell.log"
>  
>  # Log level. INFO by default
>  log_level: INFO
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 412011)
>+++ pkg-plist	(working copy)
>@@ -10,16 +10,16 @@
> %%DATADIR%%/LICENSE
> %%DATADIR%%/README.md
> %%DATADIR%%/VERSION
>-@(git,,555) %%DATADIR%%/bin/check
>-@(git,,555) %%DATADIR%%/bin/create-hooks
>-@(git,,555) %%DATADIR%%/bin/gitlab-keys
>-@(git,,555) %%DATADIR%%/bin/gitlab-projects
>-@(git,,555) %%DATADIR%%/bin/gitlab-shell
>-@(git,,555) %%DATADIR%%/bin/install
>+@(,,555) %%DATADIR%%/bin/check
>+@(,,555) %%DATADIR%%/bin/create-hooks
>+@(,,555) %%DATADIR%%/bin/gitlab-keys
>+@(,,555) %%DATADIR%%/bin/gitlab-projects
>+@(,,555) %%DATADIR%%/bin/gitlab-shell
>+@(,,555) %%DATADIR%%/bin/install
> @sample %%DATADIR%%/config.yml.sample
>-%%DATADIR%%/hooks/post-receive
>-%%DATADIR%%/hooks/pre-receive
>-%%DATADIR%%/hooks/update
>+@(,,555) %%DATADIR%%/hooks/post-receive
>+@(,,555) %%DATADIR%%/hooks/pre-receive
>+@(,,555) %%DATADIR%%/hooks/update
> %%DATADIR%%/lib/gitlab_access.rb
> %%DATADIR%%/lib/gitlab_access_status.rb
> %%DATADIR%%/lib/gitlab_config.rb
>@@ -55,11 +55,4 @@
> %%DATADIR%%/spec/vcr_cassettes/discover-ok.yml
> %%DATADIR%%/support/rewrite-hooks.sh
> %%DATADIR%%/support/truncate_repositories.sh
>-@(git,,664) /var/log/gitlab-shell.log
>-@dir %%DATADIR%%/bin
>-@dir %%DATADIR%%/hooks
>-@dir %%DATADIR%%/lib
>-@dir %%DATADIR%%/spec/vcr_cassettes
>-@dir %%DATADIR%%/spec
>-@dir %%DATADIR%%/support
>-@dir %%DATADIR%%
>+@dir(git,,755) /var/log/gitlab-shell

Actions: View | Diff

Attachments on bug 208135: 168382 | 168563 | 168706