Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Mar 2020 10:44:16 +0000 (UTC)
From:      =?UTF-8?Q?Vin=c3=adcius_Zavam?= <egypcio@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r528225 - in head/net-mgmt/semaphore: . files
Message-ID:  <202003111044.02BAiGLR049004@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: egypcio
Date: Wed Mar 11 10:44:16 2020
New Revision: 528225
URL: https://svnweb.freebsd.org/changeset/ports/528225

Log:
  net-mgmt/semaphore: fix 'incomplete file list and wrong search path'
  
  PR:		241655
  Reported by:	marek % mky.waw.pl

Added:
  head/net-mgmt/semaphore/files/patch-db_migrations.go   (contents, props changed)
Modified:
  head/net-mgmt/semaphore/Makefile
  head/net-mgmt/semaphore/pkg-plist

Modified: head/net-mgmt/semaphore/Makefile
==============================================================================
--- head/net-mgmt/semaphore/Makefile	Wed Mar 11 09:32:07 2020	(r528224)
+++ head/net-mgmt/semaphore/Makefile	Wed Mar 11 10:44:16 2020	(r528225)
@@ -2,6 +2,7 @@
 
 PORTNAME=	semaphore
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
@@ -9,8 +10,6 @@ CATEGORIES=	net-mgmt
 MAINTAINER=	egypcio@FreeBSD.org
 COMMENT=	Open Source alternative to Ansible Tower
 
-BROKEN=		unfetchable
-
 LICENSE=	MIT
 LICENSE_FILE=	${GO_WRKSRC}/LICENSE
 
@@ -67,15 +66,14 @@ GH_TUPLE=	ansible-semaphore:semaphore-vendor:a44f7be:a
 		go-mgo:mgo:3f83fa5:pkgin4/vendor/gopkg.in/mgo.v2 \
 		go-yaml:yaml:v2.2.1:pkgin5/vendor/gopkg.in/yaml.v2
 
-OPTIONS_DEFINE=	MYSQL
-MYSQL_USES=	mysql
-
 post-patch:
 	${REINPLACE_CMD} 's/%%PORTVERSION%%/${PORTVERSION}/g' \
 	  ${WRKSRC}/util/config.go
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/semaphore
-	${CP} ${WRKSRC}/config.json ${STAGEDIR}${PREFIX}/etc/semaphore/semaphore_config.json.sample
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
+	${CP} ${WRKSRC}/config.json ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/semaphore_config.json.sample
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}
+	${CP} ${WRKSRC}/db/migrations/*.sql ${STAGEDIR}${PREFIX}/share/${PORTNAME}
 
 .include <bsd.port.mk>

Added: head/net-mgmt/semaphore/files/patch-db_migrations.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/semaphore/files/patch-db_migrations.go	Wed Mar 11 10:44:16 2020	(r528225)
@@ -0,0 +1,11 @@
+--- db/migrations.go.orig	2020-02-10 17:37:11 UTC
++++ db/migrations.go
+@@ -9,7 +9,7 @@ import (
+ 	log "github.com/Sirupsen/logrus"
+ )
+ 
+-var dbAssets = packr.NewBox("./migrations")
++var dbAssets = packr.NewBox("/usr/local/share/semaphore")
+ 
+ // CheckExists queries the database to see if a migration table with this version id exists already
+ func (version *Version) CheckExists() (bool, error) {

Modified: head/net-mgmt/semaphore/pkg-plist
==============================================================================
--- head/net-mgmt/semaphore/pkg-plist	Wed Mar 11 09:32:07 2020	(r528224)
+++ head/net-mgmt/semaphore/pkg-plist	Wed Mar 11 10:44:16 2020	(r528225)
@@ -1,2 +1,21 @@
 bin/semaphore
 @sample %%ETCDIR%%/semaphore_config.json.sample
+%%DATADIR%%/v0.0.0.sql
+%%DATADIR%%/v0.1.0.sql
+%%DATADIR%%/v1.0.0.sql
+%%DATADIR%%/v1.1.0.sql
+%%DATADIR%%/v1.2.0.sql
+%%DATADIR%%/v1.3.0.sql
+%%DATADIR%%/v1.4.0.sql
+%%DATADIR%%/v1.5.0.sql
+%%DATADIR%%/v1.6.0.sql
+%%DATADIR%%/v1.7.0.sql
+%%DATADIR%%/v1.8.0.sql
+%%DATADIR%%/v1.9.0.sql
+%%DATADIR%%/v2.2.1.sql
+%%DATADIR%%/v2.3.0.sql
+%%DATADIR%%/v2.3.1.sql
+%%DATADIR%%/v2.3.2.sql
+%%DATADIR%%/v2.4.0.sql
+%%DATADIR%%/v2.5.0.sql
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003111044.02BAiGLR049004>