You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/05/24 22:28:06 UTC
[4/6] incubator-trafficcontrol git commit: move goose install
move goose install
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5cca48df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5cca48df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5cca48df
Branch: refs/heads/master
Commit: 5cca48df2546cd8378a150122c4b054a0e03f398
Parents: 3ff0f6d
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed May 24 15:00:07 2017 +0000
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed May 24 16:27:55 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/bin/_postinstall | 6 ------
traffic_ops/install/bin/postinstall | 5 ++---
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5cca48df/traffic_ops/install/bin/_postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/_postinstall b/traffic_ops/install/bin/_postinstall
index e92e335..d028c68 100755
--- a/traffic_ops/install/bin/_postinstall
+++ b/traffic_ops/install/bin/_postinstall
@@ -832,12 +832,6 @@ sub main {
errorOut("Failed to install Traffic Ops Web dependencies, check the console output and rerun postinstall once you've resolved the error");
}
- InstallUtils::logger( "Installing Go and Goose.." );
- my $rc = InstallUtils::execCommand( "./install_goose.sh" );
- if ( $rc != 0 ) {
- errorOut("Failed to install Go/Goose check the console output and rerun postinstall once you've resolved the error");
- }
-
# The generator functions handle checking input/default/automatic mode
# todbconf will be used later when setting up the database
my $todbconf = generateDbConf( $userInput, $databaseConfFile, $dbConfFile );
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5cca48df/traffic_ops/install/bin/postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall
index 7c0e04e..95b1142 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -47,9 +47,8 @@ cd /opt/traffic_ops/app
export POSTGRES_HOME=${POSTGRES_HOME:-/usr/pgsql-9.6}
/usr/local/bin/carton
-mkdir -p /opt/traffic_ops/go
-export GOPATH=${GOPATH:-/opt/traffic_ops/go}
-go get bitbucket.org/liamstask/goose/cmd/goose
+# Install go and goose
+/opt/traffic_ops/install/bin/install_goose.sh
export PERL5LIB=/opt/traffic_ops/app/lib:/opt/traffic_ops/app/local/lib/perl5
/opt/traffic_ops/install/bin/_postinstall "$@"