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/01/27 16:53:51 UTC
[30/36] incubator-trafficcontrol git commit: Fixed issue around
whether or not to generate certificate
Fixed issue around whether or not to generate certificate
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c83a26b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c83a26b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c83a26b4
Branch: refs/heads/master
Commit: c83a26b4d1968d91b40841da7d3a039e52e7b861
Parents: 6e0b916
Author: peryder <pe...@cisco.com>
Authored: Thu Dec 15 16:14:56 2016 -0500
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jan 27 09:52:53 2017 -0700
----------------------------------------------------------------------
traffic_ops/install/bin/input.json | 11 ++++++-----
traffic_ops/install/bin/postinstall-new | 18 +++++++++++-------
2 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c83a26b4/traffic_ops/install/bin/input.json
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/input.json b/traffic_ops/install/bin/input.json
index e613a3a..76720f6 100644
--- a/traffic_ops/install/bin/input.json
+++ b/traffic_ops/install/bin/input.json
@@ -84,10 +84,10 @@
"/opt/traffic_ops/install/data/profiles/":[
],
- "/opt/traffic_ops/install/bin/openssl_configuration.json":[
- {
- "Do you want to generate a certificate?": "yes",
- "config_var": "genCert"
+ "/opt/traffic_ops/install/data/json/openssl_configuration.json":[
+ {
+ "Do you want to generate a certificate?":"yes",
+ "config_var":"genCert"
},
{
"Country Name (2 letter code)":"XX",
@@ -157,7 +157,7 @@
"config_var":"health_thresh_load_avg"
},
{
- "Health Threshold Available Bandwidth in Kbps":"1750000",
+ "Health Threshold Available Bandwidth in Kbps":">1750000",
"config_var":"health_thresh_kbps"
},
{
@@ -166,3 +166,4 @@
}
]
}
+
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c83a26b4/traffic_ops/install/bin/postinstall-new
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new
index 155651c..d345663 100755
--- a/traffic_ops/install/bin/postinstall-new
+++ b/traffic_ops/install/bin/postinstall-new
@@ -41,9 +41,12 @@ our $cdnConfFile = "/opt/traffic_ops/app/conf/cdn.conf";
our $ldapConfFile = "/opt/traffic_ops/app/conf/ldap.conf";
our $usersConfFile = "/opt/traffic_ops/install/data/json/users.json";
our $profilesConfFile = "/opt/traffic_ops/install/data/profiles/";
-our $opensslConfFile = "/opt/traffic_ops/install/bin/openssl_configuration.json";
+our $opensslConfFile = "/opt/traffic_ops/install/data/json/openssl_configuration.json";
our $paramConfFile = "/opt/traffic_ops/install/data/json/profiles.json";
+our $profile_dir = "/opt/traffic_ops/install/data/profiles/";
+our $post_install_cfg = "/opt/traffic_ops/install/data/json/post_install.json";
+
our $reconfigure_defaults = "/opt/traffic_ops/.reconfigure_defaults";
our $parameters;
@@ -219,9 +222,8 @@ sub generateLdapConf {
my $useLdap = $userInput->{$fileName}[0]->{"Do you want to set up LDAP?"};
- if ( $useLdap eq "no" || $useLdap eq "n" ) {
+ if ( !lc $useLdap =~ /^y(?:es)?/ ) {
logger( "Not setting up ldap", "info" );
-
return;
}
@@ -268,6 +270,7 @@ sub generateOpenSSLConf {
my %config = getConfig( $userInput, $fileName );
writeJson( $fileName, \%config );
+ return \%config;
}
sub generateParamConf {
@@ -544,6 +547,7 @@ sub getDefaults {
sub setupDatabase {
my $todbconf = shift;
my $opensslconf = shift;
+ my $genCert = shift;
#
# Call mysql initialization script.
@@ -583,7 +587,7 @@ sub setupDatabase {
logger( "Failed to copy coverage zone file", "error" );
}
- if ( lc $opensslconf->{genCert} =~ /^y(?:es)?/ ) {
+ if ( lc $genCert =~ /^y(?:es)?/ ) {
if ( -x "/usr/bin/openssl" ) {
logger( "Installing SSL Certificates", "info" );
$result = GenerateCert::createCert($opensslconf);
@@ -735,16 +739,16 @@ sub main {
generateLdapConf( $userInput, $::ldapConfFile );
my $adminconf = generateUsersConf( $userInput, $::usersConfFile );
generateProfilesDir( $userInput, $::profilesConfFile );
- generateOpenSSLConf( $userInput, $::opensslConfFile );
+ my $opensslconf = generateOpenSSLConf( $userInput, $::opensslConfFile );
my $paramconf = generateParamConf( $userInput, $::paramConfFile );
# if the reconfigure file exists or the reconfigure command line arg is set then setup the database
if ( -f $reconfigure_file || $reconfigure ) {
if ($::automatic) {
- setupDatabase( $todbconf, $::opensslConfFile );
+ setupDatabase( $todbconf, $::opensslConfFile, $opensslconf->{genCert} );
}
else {
- setupDatabase( $todbconf, 0 );
+ setupDatabase( $todbconf, 0, $opensslconf->{genCert} );
}
}