You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/04/12 19:09:41 UTC
[1/4] incubator-trafficcontrol git commit: fix perl5lib;
require https module at the right point
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master b36993a68 -> a276c36eb
fix perl5lib; require https module at the right point
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a276c36e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a276c36e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a276c36e
Branch: refs/heads/master
Commit: a276c36eb88242a630a16c5d3f04ed354e69b275
Parents: e15ae7d
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Apr 12 12:10:28 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Apr 12 13:09:31 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/bin/postinstall | 2 +-
traffic_ops/install/lib/ProfileCleanup.pm | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a276c36e/traffic_ops/install/bin/postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall
index b113224..70e39d9 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -14,7 +14,7 @@
# limitations under the License.
#
-use lib qw(/opt/traffic_ops/install/lib);
+use lib qw(/opt/traffic_ops/install/lib /opt/traffic_ops/app/local/lib/perl5);
$ENV{PATH} = "/opt/traffic_ops/install/bin:$ENV{PATH}";
use strict;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a276c36e/traffic_ops/install/lib/ProfileCleanup.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/ProfileCleanup.pm b/traffic_ops/install/lib/ProfileCleanup.pm
index d9828cc..f9ffa01 100644
--- a/traffic_ops/install/lib/ProfileCleanup.pm
+++ b/traffic_ops/install/lib/ProfileCleanup.pm
@@ -179,6 +179,9 @@ sub profiles_exist {
InstallUtils::logger( "Checking profiles at $tmurl using username " . $config->{"username"}, "info" );
my $uri = $parameters->{'tm.url'};
+
+ # This module gets installed during BuildPerlDeps portion, so require here when it's available.
+ require 'LWP/Protocol/https.pm';
my $toCookie = get_traffic_ops_cookie( $parameters->{'tm.url'}, $config->{"username"}, $config->{"password"} );
my $profileEndpoint = "/api/1.2/profiles.json";
[4/4] incubator-trafficcontrol git commit: no symlinks,
no copying local/bin files
Posted by mi...@apache.org.
no symlinks, no copying local/bin files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8f5234d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8f5234d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8f5234d4
Branch: refs/heads/master
Commit: 8f5234d4a5e06723b915cda7086bcd565f7e9cca
Parents: b36993a
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Apr 12 09:40:52 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Apr 12 13:09:31 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/lib/BuildPerlDeps.pm | 17 -----------------
1 file changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f5234d4/traffic_ops/install/lib/BuildPerlDeps.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/BuildPerlDeps.pm b/traffic_ops/install/lib/BuildPerlDeps.pm
index 98229e9..90ff1eb 100644
--- a/traffic_ops/install/lib/BuildPerlDeps.pm
+++ b/traffic_ops/install/lib/BuildPerlDeps.pm
@@ -13,8 +13,6 @@
# limitations under the License.
#
-use lib qw(/opt/traffic_ops/install/lib /opt/traffic_ops/lib/perl5 /opt/traffic_ops/app/lib);
-
package BuildPerlDeps;
use strict;
@@ -82,21 +80,6 @@ EOF
errorOut("Failure to build required perl modules, check the output and correct the problem");
}
- if ( !-s "/opt/traffic_ops/lib/perl5" ) {
- InstallUtils::logger( "Linking perl libraries...", "info" );
- if ( !-d "/opt/traffic_ops/lib" ) {
- mkdir("/opt/traffic_ops/lib");
- }
- symlink( "/opt/traffic_ops/app/local/lib/perl5", "/opt/traffic_ops/lib/perl5" );
- InstallUtils::execCommand( "/bin/chown", "-R", "trafops:trafops", "/opt/traffic_ops/lib" );
- }
- InstallUtils::logger( "Installing perl scripts", "info" );
- chdir("/opt/traffic_ops/app/local/bin");
- my $rc = InstallUtils::execCommand( "/bin/cp", "-R", ".", "/opt/traffic_ops/app/bin" );
- if ( $rc != 0 ) {
- InstallUtils::logger( "Failed to copy perl scripts to /opt/traffic_ops/app/bin", "error" );
- }
-
return 0;
}
[3/4] incubator-trafficcontrol git commit: fix perl5lib setting
Posted by mi...@apache.org.
fix perl5lib setting
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e15ae7d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e15ae7d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e15ae7d2
Branch: refs/heads/master
Commit: e15ae7d2356d19be4c7c3355ab807b9f430aedfd
Parents: 9f53771
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Apr 12 10:48:49 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Apr 12 13:09:31 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/bin/generateCert | 2 +-
traffic_ops/install/lib/GenerateCert.pm | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e15ae7d2/traffic_ops/install/bin/generateCert
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/generateCert b/traffic_ops/install/bin/generateCert
index f22688a..faf0b36 100755
--- a/traffic_ops/install/bin/generateCert
+++ b/traffic_ops/install/bin/generateCert
@@ -17,7 +17,7 @@
use strict;
-use lib qw(/opt/traffic_ops/install/lib /opt/traffic_ops/lib/perl5 /opt/traffic_ops/app/lib);
+use lib qw(/opt/traffic_ops/install/lib /opt/traffic_ops/app/local/lib/perl5 /opt/traffic_ops/app/lib);
use JSON;
use InstallUtils;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e15ae7d2/traffic_ops/install/lib/GenerateCert.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/install/lib/GenerateCert.pm b/traffic_ops/install/lib/GenerateCert.pm
index cad3782..8c2c888 100644
--- a/traffic_ops/install/lib/GenerateCert.pm
+++ b/traffic_ops/install/lib/GenerateCert.pm
@@ -18,8 +18,6 @@ package GenerateCert;
use strict;
-use lib qw(/opt/traffic_ops/install/lib /opt/traffic_ops/lib/perl5 /opt/traffic_ops/app/lib);
-
use base qw{ Exporter };
our @EXPORT_OK = qw{ createCert };
our %EXPORT_TAGS = ( all => \@EXPORT_OK );
[2/4] incubator-trafficcontrol git commit: set ownership of
/opt/traffic_ops
Posted by mi...@apache.org.
set ownership of /opt/traffic_ops
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9f537714
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9f537714
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9f537714
Branch: refs/heads/master
Commit: 9f537714f03d613953efebe67d683c7a67966ed9
Parents: 8f5234d
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Apr 12 09:41:24 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Apr 12 13:09:31 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/bin/postinstall | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9f537714/traffic_ops/install/bin/postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall
index 2516811..b113224 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -14,9 +14,8 @@
# limitations under the License.
#
-use lib qw(/opt/traffic_ops/install/lib /opt/traffic_ops/install/lib/perl5 /opt/traffic_ops/app/local/lib/perl5 /opt/traffic_ops/app/lib);
+use lib qw(/opt/traffic_ops/install/lib);
$ENV{PATH} = "/opt/traffic_ops/install/bin:$ENV{PATH}";
-$ENV{PERL5LIB} = "/opt/traffic_ops/install/lib:/opt/traffic_ops/install/lib/perl5:/opt/traffic_ops/app/local/lib/perl5:/opt/traffic_ops/app/lib";
use strict;
use warnings;
@@ -815,6 +814,8 @@ sub main {
ProfileCleanup::add_custom_profiles( $custom_profile_dir, $adminconf, $parameters->{"tm.url"} );
}
+ InstallUtils::execCommand("/bin/chown -R trafops:trafops /opt/traffic_ops");
+
InstallUtils::logger("Postinstall complete");
InstallUtils::execCommand( "/bin/gzip", "$logFile" );