You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2017/08/18 16:28:59 UTC
[1/3] incubator-trafficcontrol git commit: removed print statement
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 10ecaaeaa -> 70735239e
removed print statement
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/91889d16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/91889d16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/91889d16
Branch: refs/heads/master
Commit: 91889d163e24d34d91d316ceafbae04a62665e38
Parents: d2a81ca
Author: Dewayne Richardson <de...@apache.org>
Authored: Fri Aug 18 10:18:39 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Aug 18 10:27:49 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/bin/start.pl | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/91889d16/traffic_ops/app/bin/start.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/start.pl b/traffic_ops/app/bin/start.pl
index 9889672..a1d288d 100755
--- a/traffic_ops/app/bin/start.pl
+++ b/traffic_ops/app/bin/start.pl
@@ -25,7 +25,6 @@ mkdir("log");
my @watch_dirs;
GetOptions('secure' => \$secure);
-print("secure #-> " , secure);
# Look in the PERL5LIB directories for any TrafficOpsRoutes files.
foreach my $dir (@INC) {
[3/3] incubator-trafficcontrol git commit: This closes #820.
Posted by da...@apache.org.
This closes #820.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/70735239
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/70735239
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/70735239
Branch: refs/heads/master
Commit: 70735239eddaffa4399ecb66702e867b2f957dfe
Parents: 91889d1
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Aug 18 10:28:47 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Aug 18 10:28:47 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] incubator-trafficcontrol git commit: added a secure flag to
start.pl
Posted by da...@apache.org.
added a secure flag to start.pl
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d2a81cae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d2a81cae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d2a81cae
Branch: refs/heads/master
Commit: d2a81cae9c15dfd1b4bbe93882b0e6d3ff627efc
Parents: 10ecaae
Author: Dewayne Richardson <de...@apache.org>
Authored: Tue Aug 15 15:07:37 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Aug 18 10:27:49 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/bin/start.pl | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d2a81cae/traffic_ops/app/bin/start.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/bin/start.pl b/traffic_ops/app/bin/start.pl
index cdd800a..9889672 100755
--- a/traffic_ops/app/bin/start.pl
+++ b/traffic_ops/app/bin/start.pl
@@ -19,10 +19,14 @@
use Data::Dumper;
use File::Basename;
use Env qw/PERL5LIB/;
+use Getopt::Long qw(GetOptions);
mkdir("log");
my @watch_dirs;
+GetOptions('secure' => \$secure);
+print("secure #-> " , secure);
+
# Look in the PERL5LIB directories for any TrafficOpsRoutes files.
foreach my $dir (@INC) {
if ( $dir =~ /traffic_ops_extensions/ ) {
@@ -43,6 +47,12 @@ print "\n$watch_dirs\n\n";
my $local_dir = dirname($0) . "/../local";
my $export = 'export PERL5LIB=$PERL5LIB:' . $local_dir . '/lib/perl5/:' . $to_lib;
-my $cmd = "$export && " . $local_dir . "/bin/morbo --listen 'http://*:3000' -v $local_dir/../script/cdn -w $watch_dirs_arg";
+my $cmd;
+if ($secure ) {
+ $cmd = "$export && " . $local_dir . "/bin/morbo --listen 'https://*:60443' -v $local_dir/../script/cdn -w $watch_dirs_arg";
+ }
+else {
+ $cmd = "$export && " . $local_dir . "/bin/morbo --listen 'http://*:3000' -v $local_dir/../script/cdn -w $watch_dirs_arg";
+}
system($cmd);