trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dang...@apache.org
Subject [10/27] incubator-trafficcontrol git commit: moved tm.toolname and tm.instance_name into the seeds
Date Tue, 09 May 2017 18:30:45 GMT
moved tm.toolname and tm.instance_name into the seeds


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a032e47f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a032e47f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a032e47f

Branch: refs/heads/master
Commit: a032e47fde485a3b3e01b65a6d581fa916369cbd
Parents: 9acda6e
Author: Dewayne Richardson <dewrich@apache.org>
Authored: Tue May 9 12:23:20 2017 -0600
Committer: Dan Kirkwood <dangogh@gmail.com>
Committed: Tue May 9 18:28:59 2017 +0000

----------------------------------------------------------------------
 traffic_ops/app/db/seeds.sql         | 37 +++++--------------------------
 traffic_ops/install/bin/_postinstall |  8 -------
 2 files changed, 5 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a032e47f/traffic_ops/app/db/seeds.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/seeds.sql b/traffic_ops/app/db/seeds.sql
index 01d02bc..da696ba 100644
--- a/traffic_ops/app/db/seeds.sql
+++ b/traffic_ops/app/db/seeds.sql
@@ -28,20 +28,12 @@ insert into job_status (name, description) values ('PENDING', 'Job is
queued, bu
 -- parameters
 -- Move into postinstall global parameters
 insert into profile (name, description, type) values ('GLOBAL', 'Global Traffic Ops profile,
DO NOT DELETE', 'UNK_PROFILE') ON CONFLICT (name) DO NOTHING;
-insert into parameter (name, config_file, value) values ('maxRevalDurationDays', 'regex_revalidate.config',
'90') ON CONFLICT (name, config_file, value) DO NOTHING;
 ---------------------------------
 
-insert into parameter (name, config_file, value) values ('CacheStats', 'traffic_stats.config',
'bandwidth') ON CONFLICT (name, config_file, value) DO NOTHING;
-insert into parameter (name, config_file, value) values ('CacheStats', 'traffic_stats.config',
'maxKbps') ON CONFLICT (name, config_file, value) DO NOTHING;
-insert into parameter (name, config_file, value) values ('CacheStats', 'traffic_stats.config',
'ats.proxy.process.http.current_client_connections') ON CONFLICT (name, config_file, value)
DO NOTHING;
-insert into parameter (name, config_file, value) values ('DsStats', 'traffic_stats.config',
'kbps') ON CONFLICT (name, config_file, value) DO NOTHING;
-insert into parameter (name, config_file, value) values ('DsStats', 'traffic_stats.config',
'status_4xx') ON CONFLICT (name, config_file, value) DO NOTHING;
-insert into parameter (name, config_file, value) values ('DsStats', 'traffic_stats.config',
'status_5xx') ON CONFLICT (name, config_file, value) DO NOTHING;
-insert into parameter (name, config_file, value) values ('DsStats', 'traffic_stats.config',
'tps_2xx') ON CONFLICT (name, config_file, value) DO NOTHING;
-insert into parameter (name, config_file, value) values ('DsStats', 'traffic_stats.config',
'tps_3xx') ON CONFLICT (name, config_file, value) DO NOTHING;
-insert into parameter (name, config_file, value) values ('DsStats', 'traffic_stats.config',
'tps_4xx') ON CONFLICT (name, config_file, value) DO NOTHING;
-insert into parameter (name, config_file, value) values ('DsStats', 'traffic_stats.config',
'tps_5xx') ON CONFLICT (name, config_file, value) DO NOTHING;
-insert into parameter (name, config_file, value) values ('DsStats', 'traffic_stats.config',
'tps_total') ON CONFLICT (name, config_file, value) DO NOTHING;
+-- profiles
+---------------------------------
+insert into parameter (name, config_file, value) values ('tm.instance_name', 'global', 'Traffic
Ops CDN') ON CONFLICT (name, config_file, value) DO NOTHING;
+insert into parameter (name, config_file, value) values ('tm.toolname', 'global', 'Traffic
Ops') ON CONFLICT (name, config_file, value) DO NOTHING;
 
 -- profiles
 ---------------------------------
@@ -53,29 +45,10 @@ insert into profile (name, description, type) values ('TRAFFIC_STATS',
'Traffic
 insert into profile (name, description, type) values ('INFLUXDB', 'InfluxDb profile', 'INFLUXDB_PROFILE')
ON CONFLICT (name) DO NOTHING;
 insert into profile (name, description, type) values ('RIAK_ALL', 'Riak profile for all CDNs',
'RIAK_PROFILE') ON CONFLICT (name) DO NOTHING;
 
--- profile_parameters
-insert into profile_parameter (profile, parameter) 
-     values ( 
-	   (select id from profile where name = 'TRAFFIC_STATS'), 
-	   (select id from parameter 
-		          where name = 'CacheStats' 
-				  and config_file = 'traffic_stats.config' 
-				  and value = 'bandwidth') ) ON CONFLICT (profile, parameter) DO NOTHING;
-insert into profile_parameter (profile, parameter) values ( (select id from profile where
name = 'TRAFFIC_STATS'), (select id from parameter where name = 'CacheStats' and config_file
= 'traffic_stats.config' and value = 'maxKbps') ) ON CONFLICT (profile, parameter) DO NOTHING;
-insert into profile_parameter (profile, parameter) values ( (select id from profile where
name = 'TRAFFIC_STATS'), (select id from parameter where name = 'CacheStats' and config_file
= 'traffic_stats.config' and value = 'ats.proxy.process.http.current_client_connections')
) ON CONFLICT (profile, parameter) DO NOTHING;
-insert into profile_parameter (profile, parameter) values ( (select id from profile where
name = 'TRAFFIC_STATS'), (select id from parameter where name = 'DsStats' and config_file
= 'traffic_stats.config' and value = 'kbps') ) ON CONFLICT (profile, parameter) DO NOTHING;
-insert into profile_parameter (profile, parameter) values ( (select id from profile where
name = 'TRAFFIC_STATS'), (select id from parameter where name = 'DsStats' and config_file
= 'traffic_stats.config' and value = 'tps_2xx') ) ON CONFLICT (profile, parameter) DO NOTHING;
-insert into profile_parameter (profile, parameter) values ( (select id from profile where
name = 'TRAFFIC_STATS'), (select id from parameter where name = 'DsStats' and config_file
= 'traffic_stats.config' and value = 'status_4xx') ) ON CONFLICT (profile, parameter) DO NOTHING;
-insert into profile_parameter (profile, parameter) values ( (select id from profile where
name = 'TRAFFIC_STATS'), (select id from parameter where name = 'DsStats' and config_file
= 'traffic_stats.config' and value = 'status_5xx') ) ON CONFLICT (profile, parameter) DO NOTHING;
-insert into profile_parameter (profile, parameter) values ( (select id from profile where
name = 'TRAFFIC_STATS'), (select id from parameter where name = 'DsStats' and config_file
= 'traffic_stats.config' and value = 'tps_3xx') ) ON CONFLICT (profile, parameter) DO NOTHING;
-insert into profile_parameter (profile, parameter) values ( (select id from profile where
name = 'TRAFFIC_STATS'), (select id from parameter where name = 'DsStats' and config_file
= 'traffic_stats.config' and value = 'tps_4xx') ) ON CONFLICT (profile, parameter) DO NOTHING;
-insert into profile_parameter (profile, parameter) values ( (select id from profile where
name = 'TRAFFIC_STATS'), (select id from parameter where name = 'DsStats' and config_file
= 'traffic_stats.config' and value = 'tps_5xx') ) ON CONFLICT (profile, parameter) DO NOTHING;
-insert into profile_parameter (profile, parameter) values ( (select id from profile where
name = 'TRAFFIC_STATS'), (select id from parameter where name = 'DsStats' and config_file
= 'traffic_stats.config' and value = 'tps_total') ) ON CONFLICT (profile, parameter) DO NOTHING;
-
 -- statuses
 insert into status (name, description) values ('OFFLINE', 'Server is Offline. Not active
in any configuration.') ON CONFLICT (name) DO NOTHING;
 insert into status (name, description) values ('ONLINE', 'Server is online.') ON CONFLICT
(name) DO NOTHING;
-insert into status (name, description) values ('REPORTED', 'Server is online and reporeted
in the health protocol.') ON CONFLICT (name) DO NOTHING;
+insert into status (name, description) values ('REPORTED', 'Server is online and reported
in the health protocol.') ON CONFLICT (name) DO NOTHING;
 insert into status (name, description) values ('ADMIN_DOWN', 'Sever is administrative down
and does not receive traffic.') ON CONFLICT (name) DO NOTHING;
 insert into status (name, description) values ('CCR_IGNORE', 'Server is ignored by traffic
router.') ON CONFLICT (name) DO NOTHING;
 insert into status (name, description) values ('PRE_PROD', 'Pre Production. Not active in
any configuration.') ON CONFLICT (name) DO NOTHING;

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a032e47f/traffic_ops/install/bin/_postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/_postinstall b/traffic_ops/install/bin/_postinstall
index 96149a9..60da86c 100755
--- a/traffic_ops/install/bin/_postinstall
+++ b/traffic_ops/install/bin/_postinstall
@@ -495,14 +495,6 @@ sub getDefaults {
                 "config_var"      => "tm.url"
             },
             {
-                "Traffic Ops Instance Name" => "Traffic Ops CDN",
-                "config_var"      => "tm.instance_name"
-            },
-            {
-                "Traffic Ops Tool Name" => "Traffic Ops",
-                "config_var"      => "tm.toolname"
-            },
-            {
                 "Human-readable CDN Name.  (No whitespace, please)" => "kabletown_cdn",
                 "config_var"                                        => "cdn_name"
             },


Mime
View raw message