[3/3] incubator-trafficcontrol git commit: This closes #244.
This closes #244. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/af23649b Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/af23649b Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/af23649b Branch: refs/heads/master Commit: af23649b845a8976bab63da33c1c8bebf1685172 Parents: f0f01d2 Author: Dan KirkwoodAuthored: Mon Feb 6 10:59:08 2017 -0700 Committer: Dan Kirkwood Committed: Mon Feb 6 10:59:08 2017 -0700 -- --
[2/3] incubator-trafficcontrol git commit: adds seed data lost when migration files were removed
adds seed data lost when migration files were removed Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c1a2c020 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c1a2c020 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c1a2c020 Branch: refs/heads/master Commit: c1a2c02056bd64d96826181898e4143d689e36d3 Parents: 480d888 Author: Jeremy MitchellAuthored: Wed Feb 1 12:29:24 2017 -0700 Committer: Dan Kirkwood Committed: Mon Feb 6 10:58:42 2017 -0700 -- traffic_ops/app/db/seeds.sql | 16 1 file changed, 16 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c1a2c020/traffic_ops/app/db/seeds.sql -- diff --git a/traffic_ops/app/db/seeds.sql b/traffic_ops/app/db/seeds.sql index 6fb85ee..47d5c94 100644 --- a/traffic_ops/app/db/seeds.sql +++ b/traffic_ops/app/db/seeds.sql @@ -20,6 +20,8 @@ insert into role (id, name, description, priv_level) values (4, 'admin','super-u insert into role (id, name, description, priv_level) values (5, 'portal','Portal User', 2) ON CONFLICT DO NOTHING; insert into role (id, name, description, priv_level) values (6, 'migrations','database migrations user - DO NOT REMOVE', 20) ON CONFLICT DO NOTHING; insert into role (id, name, description, priv_level) values (7, 'federation','Role for Secondary CZF', 15) ON CONFLICT DO NOTHING; +insert into role (id, name, description, priv_level) values (8, 'steering', 'Role for Steering Delivery Services', 15) ON CONFLICT DO NOTHING; + insert into tm_user (username, role,full_name) values ('portal',(select id from role where name='portal'),'Portal User') ON CONFLICT DO NOTHING; insert into tm_user (username, role, full_name, token) values ('extension', 3, 'Extension User, DO NOT DELETE', '91504CE6-8E4A-46B2-9F9F-FE7C15228498') ON CONFLICT DO NOTHING; insert into type (name, description, use_in_table) values ('CHECK_EXTENSION_BOOL', 'Extension for checkmark in Server Check', 'to_extension') ON CONFLICT DO NOTHING; @@ -33,6 +35,20 @@ insert into parameter (name, config_file, value) values ('ttl_max_hours', 'regex insert into parameter (name, config_file, value) values ('ttl_min_hours', 'regex_revalidate.config', '48') ON CONFLICT DO NOTHING; insert into parameter (name, config_file, value) values ('maxRevalDurationDays', 'regex_revalidate.config', '90') ON CONFLICT DO NOTHING; +insert into type (name, description, use_in_table) values ('ANY_MAP', 'No Content Routing - arbitrary remap at the edge, no Traffic Router config', 'deliveryservice') ON CONFLICT DO NOTHING; +insert into type (name, description, use_in_table) values ('ORG_LOC', 'Origin Logical Site', 'cachegroup') ON CONFLICT DO NOTHING; +insert into type (name, description, use_in_table) values ('STEERING', 'Steering Delivery Service', 'deliveryservice') ON CONFLICT DO NOTHING; +insert into type (name, description, use_in_table) values ('STEERING_REGEXP', 'Steering target filter regular expression', 'regex') ON CONFLICT DO NOTHING; + +insert into job_status (name, description) values ('PENDING', 'Job is queued, but has not been picked up by any agents yet') ON CONFLICT DO NOTHING; +insert into job_status (name, description) values ('IN_PROGRESS', 'Job is being processed by agents') ON CONFLICT DO NOTHING; +insert into job_status (name, description) values ('COMPLETED', 'Job has finished') ON CONFLICT DO NOTHING; +insert into job_status (name, description) values ('CANCELLED', 'Job was cancelled') ON CONFLICT DO NOTHING; +insert into job_status (name, description) values ('PURGE', 'Initial Purge state') ON CONFLICT DO NOTHING; +insert into job_agent (name, description, active) values ('dummy','Description of Purge Agent','1') ON CONFLICT DO NOTHING; + +insert into status (name, description) values ('PRE_PROD', 'Pre Production. Not active in any configuration.') ON CONFLICT DO NOTHING; + -- some of the old ones do not get a new place, and there will be 'gaps' in the column usage New to_extension add will have to take care of that. insert into to_extension (id, name, servercheck_short_name, servercheck_column_name, version, info_url, script_file, isactive, additional_config_json, type) values (1, 'ILO_PING', 'ILO', 'aa', '1.0.0', '-', 'ToPingCheck.pl', '1', '{ check_name: "ILO", "base_url": "https://localhost;, "select": "ilo_ip_address", "cron": "9 * * * *" }',
[1/2] incubator-trafficcontrol git commit: uses dbix prefetch to eliminate n+1 queries and removes example urls intented for a single deliveryservice
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master af23649b8 -> a401a25e9 uses dbix prefetch to eliminate n+1 queries and removes example urls intented for a single deliveryservice Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5be91637 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5be91637 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5be91637 Branch: refs/heads/master Commit: 5be9163775d38984c9929249506cf68d95b42356 Parents: af23649 Author: Jeremy MitchellAuthored: Mon Feb 6 10:37:25 2017 -0700 Committer: Dan Kirkwood Committed: Mon Feb 6 11:20:58 2017 -0700 -- .../traffic_ops_api/v12/deliveryservice.rst | 3 --- traffic_ops/app/lib/API/Deliveryservice.pm | 15 +-- 2 files changed, 5 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5be91637/docs/source/development/traffic_ops_api/v12/deliveryservice.rst -- diff --git a/docs/source/development/traffic_ops_api/v12/deliveryservice.rst b/docs/source/development/traffic_ops_api/v12/deliveryservice.rst index c1100dd..9e81b92 100644 --- a/docs/source/development/traffic_ops_api/v12/deliveryservice.rst +++ b/docs/source/development/traffic_ops_api/v12/deliveryservice.rst @@ -199,9 +199,6 @@ Delivery Service "dnsBypassTtl": "30", "dscp": "40", "edgeHeaderRewrite": null, -"exampleURLs": [ -"http://edge.foo-ds.foo.bar.net; -], "geoLimit": "0", "geoLimitCountries": null, "geoLimitRedirectURL": null, http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5be91637/traffic_ops/app/lib/API/Deliveryservice.pm -- diff --git a/traffic_ops/app/lib/API/Deliveryservice.pm b/traffic_ops/app/lib/API/Deliveryservice.pm index 0220cc0..88f7ab7 100644 --- a/traffic_ops/app/lib/API/Deliveryservice.pm +++ b/traffic_ops/app/lib/API/Deliveryservice.pm @@ -55,12 +55,8 @@ sub index { $criteria{'me.id'} = { -in => \@ds_ids },; } - my $rs_data = $self->db->resultset("Deliveryservice")->search( \%criteria, { order_by => 'me.' . $orderby } ); + my $rs_data = $self->db->resultset("Deliveryservice")->search( \%criteria, { prefetch => [ 'cdn', 'profile', 'type' ], order_by => 'me.' . $orderby } ); while ( my $row = $rs_data->next ) { - my $cdn_domain = $self->get_cdn_domain_by_ds_id( $row->id ); - my $regexp_set = ::DeliveryService::get_regexp_set( $self, $row->id ); - my @example_urls = ::DeliveryService::get_example_urls( $self, $row->id, $regexp_set, $row, $cdn_domain, $row->protocol ); - push( @data, { "active" => \$row->active, @@ -76,7 +72,6 @@ sub index { "dnsBypassTtl" => $row->dns_bypass_ttl, "dscp" => $row->dscp, "edgeHeaderRewrite"=> $row->edge_header_rewrite, - "exampleURLs" => \@example_urls, "geoLimitRedirectURL" => $row->geolimit_redirect_url, "geoLimit" => $row->geo_limit, "geoLimitCountries"=> $row->geo_limit_countries, @@ -95,8 +90,8 @@ sub index { "longDesc2"=> $row->long_desc_2, "maxDnsAnswers"=> $row->max_dns_answers, "midHeaderRewrite" => $row->mid_header_rewrite, - "missLat" => 0.0 + $row->miss_lat, - "missLong" => 0.0 + $row->miss_long, + "missLat" => defined($row->miss_lat) ? 0.0 + $row->miss_lat : undef, + "missLat" => defined($row->miss_long) ? 0.0 + $row->miss_long : undef, "multiSiteOrigin" => \$row->multi_site_origin, "multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm, "orgServerFqdn"=> $row->org_server_fqdn, @@ -192,8 +187,8 @@ sub show { "matchList"=>
[1/3] incubator-trafficcontrol git commit: organizes seeds file
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 480d8887f -> af23649b8 organizes seeds file Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/f0f01d2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/f0f01d2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/f0f01d2f Branch: refs/heads/master Commit: f0f01d2f95cdb890321f37faee652d459d8038e2 Parents: c1a2c02 Author: Jeremy MitchellAuthored: Wed Feb 1 13:56:01 2017 -0700 Committer: Dan Kirkwood Committed: Mon Feb 6 10:58:42 2017 -0700 -- traffic_ops/app/db/seeds.sql | 214 -- 1 file changed, 111 insertions(+), 103 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/f0f01d2f/traffic_ops/app/db/seeds.sql -- diff --git a/traffic_ops/app/db/seeds.sql b/traffic_ops/app/db/seeds.sql index 47d5c94..16a6964 100644 --- a/traffic_ops/app/db/seeds.sql +++ b/traffic_ops/app/db/seeds.sql @@ -13,6 +13,7 @@ limitations under the License. */ +-- roles insert into role (id, name, description, priv_level) values (1, 'disallowed','Block all access',0) ON CONFLICT DO NOTHING; insert into role (id, name, description, priv_level) values (2, 'read-only user','Block all access', 10) ON CONFLICT DO NOTHING; insert into role (id, name, description, priv_level) values (3, 'operations','Block all access', 20) ON CONFLICT DO NOTHING; @@ -22,8 +23,11 @@ insert into role (id, name, description, priv_level) values (6, 'migrations','da insert into role (id, name, description, priv_level) values (7, 'federation','Role for Secondary CZF', 15) ON CONFLICT DO NOTHING; insert into role (id, name, description, priv_level) values (8, 'steering', 'Role for Steering Delivery Services', 15) ON CONFLICT DO NOTHING; -insert into tm_user (username, role,full_name) values ('portal',(select id from role where name='portal'),'Portal User') ON CONFLICT DO NOTHING; -insert into tm_user (username, role, full_name, token) values ('extension', 3, 'Extension User, DO NOT DELETE', '91504CE6-8E4A-46B2-9F9F-FE7C15228498') ON CONFLICT DO NOTHING; +-- types +insert into type (name, description, use_in_table) values ('ANY_MAP', 'No Content Routing - arbitrary remap at the edge, no Traffic Router config', 'deliveryservice') ON CONFLICT DO NOTHING; +insert into type (name, description, use_in_table) values ('ORG_LOC', 'Origin Logical Site', 'cachegroup') ON CONFLICT DO NOTHING; +insert into type (name, description, use_in_table) values ('STEERING', 'Steering Delivery Service', 'deliveryservice') ON CONFLICT DO NOTHING; +insert into type (name, description, use_in_table) values ('STEERING_REGEXP', 'Steering target filter regular expression', 'regex') ON CONFLICT DO NOTHING; insert into type (name, description, use_in_table) values ('CHECK_EXTENSION_BOOL', 'Extension for checkmark in Server Check', 'to_extension') ON CONFLICT DO NOTHING; insert into type (name, description, use_in_table) values ('CHECK_EXTENSION_NUM', 'Extension for int value in Server Check', 'to_extension') ON CONFLICT DO NOTHING; insert into type (name, description, use_in_table) values ('CHECK_EXTENSION_OPEN_SLOT', 'Open slot for check in Server Status', 'to_extension') ON CONFLICT DO NOTHING; @@ -31,104 +35,28 @@ insert into type (name, description, use_in_table) values ('CONFIG_EXTENSION', ' insert into type (name, description, use_in_table) values ('STATISTIC_EXTENSION', 'Extension source for 12M graphs', 'to_extension') ON CONFLICT DO NOTHING; insert into type (name, description, use_in_table) values ('RESOLVE4', 'federation type resolve4', 'federation') ON CONFLICT DO NOTHING; insert into type (name, description, use_in_table) values ('RESOLVE6', 'federation type resolve6', 'federation') ON CONFLICT DO NOTHING; -insert into parameter (name, config_file, value) values ('ttl_max_hours', 'regex_revalidate.config', '672') ON CONFLICT DO NOTHING; -insert into parameter (name, config_file, value) values ('ttl_min_hours', 'regex_revalidate.config', '48') ON CONFLICT DO NOTHING; -insert into parameter (name, config_file, value) values ('maxRevalDurationDays', 'regex_revalidate.config', '90') ON CONFLICT DO NOTHING; +insert into type (name, description, use_in_table) values ('RIAK', 'Riak keystore', 'server') ON CONFLICT DO NOTHING; +insert into type (name, description, use_in_table) values ('TRAFFIC_STATS', 'traffic_stats server', 'server') ON CONFLICT DO NOTHING; +insert into type (name, description, use_in_table) values ('TRAFFIC_PORTAL', 'traffic_portal server', 'server') ON CONFLICT DO
[2/2] incubator-trafficcontrol git commit: This closes #252.
This closes #252. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a401a25e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a401a25e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a401a25e Branch: refs/heads/master Commit: a401a25e97675e33612a35902a24a4446d6bbaeb Parents: 5be9163 Author: Dan KirkwoodAuthored: Mon Feb 6 11:22:11 2017 -0700 Committer: Dan Kirkwood Committed: Mon Feb 6 11:22:11 2017 -0700 -- --
[2/4] incubator-trafficcontrol git commit: adds license details for experimental TO ui theme and loading bar used in traffic portal and experimental TO UI
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/57068b4c/traffic_ops/experimental/ui/app/src/styles/main.scss -- diff --git a/traffic_ops/experimental/ui/app/src/styles/main.scss b/traffic_ops/experimental/ui/app/src/styles/main.scss index eda4be5..653e961 100755 --- a/traffic_ops/experimental/ui/app/src/styles/main.scss +++ b/traffic_ops/experimental/ui/app/src/styles/main.scss @@ -116,555 +116,6 @@ body.nav-sm .container.body .main-content { font-weight: bold; } -.pagination { - display: inline-block; - padding-left: 0; - margin: 0; - border-radius: 4px; -} - -.modal-footer .btn + .btn { - margin-bottom: 6px; -} - -.border-blue { - border-color: #3498DB !important; -} - -.border-purple { - border-color: #9B59B6 !important; -} - -.border-green { - border-color: #1ABB9C !important; -} - -.border-aero { - border-color: #9CC2CB !important; -} - -.border-red { - border-color: #E74C3C !important; -} - -.border-dark { - border-color: #34495E !important; -} - -.bg-white { - background: #fff !important; - border: 1px solid #fff !important; - color: #73879C; -} - -.bg-red { - background: #E74C3C !important; - border: 1px solid #E74C3C !important; - color: #fff; -} - -.bg-blue { - background: #3498DB !important; - border: 1px solid #3498DB !important; - color: #fff; -} - -.bg-green { - background: #1ABB9C !important; - border: 1px solid #1ABB9C !important; - color: #fff; -} - -.bg-orange { - background: #F39C12 !important; - border: 1px solid #F39C12 !important; - color: #fff; -} - -.bg-purple { - background: #9B59B6 !important; - border: 1px solid #9B59B6 !important; - color: #fff; -} - -.bg-blue-sky { - background: #50C1CF !important; - border: 1px solid #50C1CF !important; - color: #fff; -} - -.no-padding { - padding: 0 !important; -} - -.page-title { - width: 100%; - height: 65px; - padding: 10px 0; -} - -.page-title .title_left { - width: 45%; - float: left; - display: block; -} - -.page-title .title_left h3 { - margin: 9px 0; -} - -.page-title .title_right { - width: 55%; - float: left; - display: block; -} - -.page-title .title_right .pull-right { - margin: 10px 0; -} - -.fixed_height_320 { - height: 320px; -} - -.fixed_height_390 { - height: 390px; -} - -.fixed_height_200 { - height: 200px; -} - -.overflow_hidden { - overflow: hidden -} - -.progress-bar-dark { - background-color: #34495E !important; -} - -.progress-bar-gray { - background-color: #BDC3C7 !important; -} - -table.no-margin .progress { - margin-bottom: 0; -} - -.main_content { - padding: 10px 20px; -} - -.col-md-55 { - width: 50%; - margin-bottom: 10px; -} - -@media (max-width: 992px) { - .tile_stats_count { -margin-bottom: 10px; -border-bottom: 1px solid #D9DEE4; -padding-bottom: 10px; - } -} - -@media (min-width: 992px) and (max-width: 1100px) { - .tile_stats_count .count { -font-size: 35px !important; - } -} - -@media(max-width:768px) { - .tile_stats_count .count { -font-size: 30px !important; - } - .tile_stats_count .right span { -font-size: 12px; - } -} - -@media (min-width: 768px) { - .col-md-55 { -width: 20%; - } -} - -@media (min-width: 992px) { - .col-md-55 { -width: 20%; - } -} - -@media (min-width: 1200px) { - .col-md-55 { -width: 20%; - } -} - -@media (min-width: 192px) and (max-width: 1270px) { - .hidden-small { -display: none !important; - } - table.tile_info span.right { -margin-right: 7px; -float: left; - } -} - -.center-margin { - margin: 0 auto; - float: none!important; -} - -.col-md-55, -.col-xs-1, -.col-sm-1, -.col-md-1, -.col-lg-1, -.col-xs-2, -.col-sm-2, -.col-md-2, -.col-lg-2, -.col-xs-3, -.col-sm-3, -.col-md-3, -.col-lg-3, -.col-xs-4, -.col-sm-4, -.col-md-4, -.col-lg-4, -.col-xs-5, -.col-sm-5, -.col-md-5, -.col-lg-5, -.col-xs-6, -.col-sm-6, -.col-md-6, -.col-lg-6, -.col-xs-7, -.col-sm-7, -.col-md-7, -.col-lg-7, -.col-xs-8, -.col-sm-8, -.col-md-8, -.col-lg-8, -.col-xs-9, -.col-sm-9, -.col-md-9, -.col-lg-9, -.col-xs-10, -.col-sm-10, -.col-md-10, -.col-lg-10, -.col-xs-11, -.col-sm-11, -.col-md-11, -.col-lg-11, -.col-xs-12, -.col-sm-12, -.col-md-12, -.col-lg-12 { - position: relative; - min-height: 1px; - float: left; - padding-right: 10px; - padding-left: 10px; -} - -.row { - margin-right: -10px; - margin-left: -10px; -} - -.grid_slider .col-md-6 { - padding: 0 40px; -} - -h1, -.h1, -h2, -.h2, -h3, -.h3 { - margin-top: 10px; - margin-bottom: 10px; -} - -a { - color: #5A738E; - text-decoration: none; -} - -a, -a:visited, -a:focus, -a:active, -:visited, -:focus, -:active, -.btn:focus, -.btn:active:focus, -.btn.active:focus, -.btn.focus, -.btn:active.focus, -.btn.active.focus { - outline: 0; -} - -a:hover, -a:focus { - text-decoration: none -} - -.navbar-brand, -.navbar-nav>li>.btn-group>.btn-link { - font-weight: 500; - color: #ECF0F1 !important; - margin-left: 0 !important; - line-height:
[3/4] incubator-trafficcontrol git commit: adds license details for experimental TO ui theme and loading bar used in traffic portal and experimental TO UI
adds license details for experimental TO ui theme and loading bar used in traffic portal and experimental TO UI Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/57068b4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/57068b4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/57068b4c Branch: refs/heads/master Commit: 57068b4ce64e32a5374417fcab774f0e5d97f6eb Parents: 9b0b3ac Author: Jeremy MitchellAuthored: Tue Jan 24 11:15:41 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:29:31 2017 -0700 -- traffic_ops/experimental/ui/app/src/index.html |2 + .../experimental/ui/app/src/styles/loading.scss | 110 + .../experimental/ui/app/src/styles/main.scss| 5945 -- .../experimental/ui/app/src/styles/theme.scss | 4174 traffic_portal/app/src/index.html |1 + traffic_portal/app/src/styles/loading.scss | 110 + traffic_portal/app/src/styles/main.scss | 113 - 7 files changed, 4397 insertions(+), 6058 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/57068b4c/traffic_ops/experimental/ui/app/src/index.html -- diff --git a/traffic_ops/experimental/ui/app/src/index.html b/traffic_ops/experimental/ui/app/src/index.html index ee95434..ac22f1d 100644 --- a/traffic_ops/experimental/ui/app/src/index.html +++ b/traffic_ops/experimental/ui/app/src/index.html @@ -30,6 +30,8 @@ under the License. + + http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/57068b4c/traffic_ops/experimental/ui/app/src/styles/loading.scss -- diff --git a/traffic_ops/experimental/ui/app/src/styles/loading.scss b/traffic_ops/experimental/ui/app/src/styles/loading.scss new file mode 100644 index 000..eef92fe --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/styles/loading.scss @@ -0,0 +1,110 @@ +/*! + * angular-loading-bar v0.4.2 + * https://chieffancypants.github.io/angular-loading-bar + * Copyright (c) 2014 Wes Cruver + * License: MIT + */ + +/* Make clicks pass-through */ +#loading-bar, +#loading-bar-spinner { + pointer-events: none; + -webkit-pointer-events: none; + -webkit-transition: 350ms linear all; + -moz-transition: 350ms linear all; + -o-transition: 350ms linear all; + transition: 350ms linear all; +} + +#loading-bar.ng-enter, +#loading-bar.ng-leave.ng-leave-active, +#loading-bar-spinner.ng-enter, +#loading-bar-spinner.ng-leave.ng-leave-active { + opacity: 0; +} + +#loading-bar.ng-enter.ng-enter-active, +#loading-bar.ng-leave, +#loading-bar-spinner.ng-enter.ng-enter-active, +#loading-bar-spinner.ng-leave { + opacity: 1; +} + +#loading-bar .bar { + -webkit-transition: width 350ms; + -moz-transition: width 350ms; + -o-transition: width 350ms; + transition: width 350ms; + + background: #29d; + position: fixed; + z-index: 2000; + top: 0; + left: 0; + width: 100%; + height: 2px; + border-bottom-right-radius: 1px; + border-top-right-radius: 1px; +} + +/* Fancy blur effect */ +#loading-bar .peg { + position: absolute; + width: 70px; + right: 0; + top: 0; + height: 2px; + opacity: .45; + -moz-box-shadow: #29d 1px 0 6px 1px; + -ms-box-shadow: #29d 1px 0 6px 1px; + -webkit-box-shadow: #29d 1px 0 6px 1px; + box-shadow: #29d 1px 0 6px 1px; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; + border-radius: 100%; +} + +#loading-bar-spinner { + display: none; + position: fixed; + z-index: 2000; + top: 10px; + left: 10px; +} + +#loading-bar-spinner .spinner-icon { + width: 14px; + height: 14px; + + border: solid 2px transparent; + border-top-color: #29d; + border-left-color: #29d; + border-radius: 10px; + + -webkit-animation: loading-bar-spinner 400ms linear infinite; + -moz-animation:loading-bar-spinner 400ms linear infinite; + -ms-animation: loading-bar-spinner 400ms linear infinite; + -o-animation: loading-bar-spinner 400ms linear infinite; + animation: loading-bar-spinner 400ms linear infinite; +} + +@-webkit-keyframes loading-bar-spinner { + 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); } +} +@-moz-keyframes loading-bar-spinner { + 0% { -moz-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -moz-transform: rotate(360deg); transform: rotate(360deg); } +} +@-o-keyframes loading-bar-spinner { + 0% { -o-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -o-transform:
[2/2] incubator-trafficcontrol git commit: This closes #217.
This closes #217. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fe1f251b Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fe1f251b Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fe1f251b Branch: refs/heads/master Commit: fe1f251bea8d9b5d8343faeb972ceded4689d6fc Parents: d82c665 Author: Dan KirkwoodAuthored: Tue Jan 24 11:56:18 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:56:18 2017 -0700 -- --
[1/4] incubator-trafficcontrol git commit: adds license details for experimental TO ui theme and loading bar used in traffic portal and experimental TO UI
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 9b0b3acb3 -> 062334b60 http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/57068b4c/traffic_ops/experimental/ui/app/src/styles/theme.scss -- diff --git a/traffic_ops/experimental/ui/app/src/styles/theme.scss b/traffic_ops/experimental/ui/app/src/styles/theme.scss new file mode 100644 index 000..8dc3357 --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/styles/theme.scss @@ -0,0 +1,4174 @@ +/*! + * gentelella v1.3.0 + * https://colorlib.com/polygon/gentelella/index.html + * Copyright (c) 2016 Aigars Silkalns & Colorlib + * License: MIT + */ + +.daterangepicker .ranges li { + color: #73879C +} +.daterangepicker .ranges li.active, +.daterangepicker .ranges li:hover { + background: #536A7F; + border: 1px solid #536A7F; + color: #fff +} +.daterangepicker .input-mini { + background-color: #eee; + border: 1px solid #ccc; + box-shadow: none !important +} +.daterangepicker .input-mini.active { + border: 1px solid #ccc +} +.daterangepicker select.monthselect, +.daterangepicker select.yearselect, +.daterangepicker select.hourselect, +.daterangepicker select.minuteselect, +.daterangepicker select.secondselect, +.daterangepicker select.ampmselect { + font-size: 12px; + padding: 1px; + height: auto; + margin: 0; + cursor: default; + height: 30px; + border: 1px solid #ADB2B5; + line-height: 30px; + border-radius: 0px !important +} +.daterangepicker select.monthselect { + margin-right: 2% +} +.daterangepicker td.in-range { + background: #E4E7EA; + color: #73879C +} +.daterangepicker td.active, +.daterangepicker td.active:hover { + background-color: #536A7F; + color: #fff +} +.daterangepicker th.available:hover { + background: #eee; + color: #34495E +} +.daterangepicker:before, +.daterangepicker:after { + content: none +} +.daterangepicker .calendar.single { + margin: 0 0 4px 0 +} +.daterangepicker .calendar.single .calendar-table { + width: 224px; + padding: 0 0 4px 0 !important +} +.daterangepicker .calendar.single .calendar-table thead tr:first-child th { + padding: 8px 5px +} +.daterangepicker .calendar.single .calendar-table thead th { + border-radius: 0 +} +.daterangepicker.picker_1 { + color: #fff; + background: #34495E +} +.daterangepicker.picker_1 .calendar-table { + background: #34495E +} +.daterangepicker.picker_1 .calendar-table thead tr { + background: #213345 +} +.daterangepicker.picker_1 .calendar-table thead tr:first-child { + background: #1ABB9C +} +.daterangepicker.picker_1 .calendar-table td.off { + background: #34495E; + color: #999 +} +.daterangepicker.picker_1 .calendar-table td.available:hover { + color: #34495E +} +.daterangepicker.picker_2 .calendar-table thead tr { + color: #1ABB9C +} +.daterangepicker.picker_2 .calendar-table thead tr:first-child { + color: #73879C +} +.daterangepicker.picker_3 .calendar-table thead tr:first-child { + color: #fff; + background: #1ABB9C +} +.daterangepicker.picker_4 .calendar-table thead tr:first-child { + color: #fff; + background: #34495E +} +.daterangepicker.picker_4 .calendar-table td, +.daterangepicker.picker_4 .calendar-table td.off { + background: #ECF0F1; + border: 1px solid #fff; + border-radius: 0 +} +.daterangepicker.picker_4 .calendar-table td.active { + background: #34495E +} +.calendar-exibit .show-calendar { + float: none; + display: block; + position: relative; + background-color: #fff; + border: 1px solid #ccc; + margin-bottom: 20px; + border: 1px solid rgba(0, 0, 0, 0.15); + overflow: hidden +} +.calendar-exibit .show-calendar .calendar { + margin: 0 0 4px 0 +} +.calendar-exibit .show-calendar.picker_1 { + background: #34495E +} +.calendar-exibit .calendar-table { + padding: 0 0 4px 0 +} +.left_col { + background: #2A3F54 +} +.nav-sm .container.body .col-md-3.left_col { + min-height: 100%; + width: 70px; + padding: 0; + z-index: ; + position: absolute +} +.nav-sm .container.body .col-md-3.left_col.menu_fixed { + position: fixed; + height: 100% +} +.nav-sm .container.body .col-md-3.left_col .mCSB_container, +.nav-sm .container.body .col-md-3.left_col .mCustomScrollBox { + overflow: visible +} +.nav-sm .hidden-small { + visibility: hidden +} +.nav-sm .container.body .right_col { + padding: 10px 20px; + margin-left: 70px; + z-index: 2 +} +.nav-sm .navbar.nav_title { + width: 70px +} +.nav-sm .navbar.nav_title a span { + display: none +} +.nav-sm .navbar.nav_title a i { + font-size: 27px; + margin: 13px 0 0 3px +} +.site_title i { + border: 1px solid #EAEAEA; + padding: 5px 6px; + border-radius: 50% +} +.nav-sm .main_container .top_nav { + display: block; + margin-left: 70px; + z-index: 2 +} +.nav-sm .nav.side-menu li a { + text-align: center !important; + font-weight: 400; + font-size: 10px; + padding: 10px 5px +} +.nav-sm .nav.child_menu li.active, +.nav-sm .nav.side-menu li.active-sm { +
[4/4] incubator-trafficcontrol git commit: This closes #216.
This closes #216. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/062334b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/062334b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/062334b6 Branch: refs/heads/master Commit: 062334b60355819ed0db8330840eaac3076266dd Parents: 57068b4 Author: Dan KirkwoodAuthored: Tue Jan 24 11:30:12 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:30:12 2017 -0700 -- --
[2/2] incubator-trafficcontrol git commit: This closes #218.
This closes #218. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e524bce5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e524bce5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e524bce5 Branch: refs/heads/master Commit: e524bce53c48a13e1953bcf2b379fd1d2cb4c21e Parents: 631d2b3 Author: Dan KirkwoodAuthored: Tue Jan 24 13:07:46 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 13:07:46 2017 -0700 -- --
[1/2] incubator-trafficcontrol git commit: Minor license fix for the jquery.tree component.
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master fe1f251be -> e524bce53 Minor license fix for the jquery.tree component. Also contains text fix to remove lines with @ at the beginning, as they look like links. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/631d2b30 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/631d2b30 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/631d2b30 Branch: refs/heads/master Commit: 631d2b309bf86d1168efc8c4e6b834b71e973d27 Parents: fe1f251 Author: Chris LemmonsAuthored: Tue Jan 24 13:03:55 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 13:07:24 2017 -0700 -- LICENSE | 24 +--- 1 file changed, 17 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/631d2b30/LICENSE -- diff --git a/LICENSE b/LICENSE index 0625f9f..a9fd3df 100644 --- a/LICENSE +++ b/LICENSE @@ -292,12 +292,12 @@ For the jMenu component: / * -@Name: jMenu - jQuery Plugin -@Revison : 2.0 -@Date: 08/2013 -@Author : ALPIXEL - (www.myjqueryplugins.com - www.alpixel.fr) -@Support : FF, IE7, IE8, MAC Firefox, MAC Safari -@License : Open Source - MIT License : http://www.opensource.org/licenses/mit-license.php +Name: jMenu - jQuery Plugin +Revison : 2.0 +Date: 08/2013 +Author : ALPIXEL - (www.myjqueryplugins.com - www.alpixel.fr) +Support : FF, IE7, IE8, MAC Firefox, MAC Safari +License : Open Source - MIT License : http://www.opensource.org/licenses/mit-license.php ** */ @@ -323,6 +323,17 @@ For the DataTables component: * For details please refer to: http://www.datatables.net */ +For the jquery.tree component: +@traffic_ops/app/public/*/jquery.tree.min.* + +/* + * Tree - jQuery Tree Widget + * @author Valerio Galano + * @license MIT + * @see https://github.com/daredevel/jquery-tree + * @version 0.1 + */ + For the ng-map component: @traffic_ops/experimental/ui/app/src/assets/js/ng-map_1.17.6.min.js @@ -553,4 +564,3 @@ Several subsections of main.css are under the MIT license, as noted in the file: For the bootstrap-progressbar component: /*! bootstrap-progressbar v0.8.4 | Copyright (c) 2012-2014 Stephan Groà | MIT license | http://www.minddust.com */ -
[06/13] incubator-trafficcontrol git commit: Vendored github.com/cihub/seelog.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d969e13b/traffic_stats/vendor/github.com/cihub/seelog/writers_bufferedwriter_test.go -- diff --git a/traffic_stats/vendor/github.com/cihub/seelog b/traffic_stats/vendor/github.com/cihub/seelog deleted file mode 16 index 175e6e3..000 --- a/traffic_stats/vendor/github.com/cihub/seelog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 175e6e3d439fe2e1cee7ab652b12eb546c145a13 diff --git a/traffic_stats/vendor/github.com/cihub/seelog/writers_bufferedwriter_test.go b/traffic_stats/vendor/github.com/cihub/seelog/writers_bufferedwriter_test.go new file mode 100644 index 000..03f74f7 --- /dev/null +++ b/traffic_stats/vendor/github.com/cihub/seelog/writers_bufferedwriter_test.go @@ -0,0 +1,78 @@ +// Copyright (c) 2012 - Cloud Instruments Co., Ltd. +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this +//list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright notice, +//this list of conditions and the following disclaimer in the documentation +//and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package seelog + +import ( + "testing" +) + +func TestChunkWriteOnFilling(t *testing.T) { + writer, _ := newBytesVerifier(t) + bufferedWriter, err := NewBufferedWriter(writer, 1024, 0) + + if err != nil { + t.Fatalf("Unexpected buffered writer creation error: %s", err.Error()) + } + + bytes := make([]byte, 1000) + + bufferedWriter.Write(bytes) + writer.ExpectBytes(bytes) + bufferedWriter.Write(bytes) +} + +func TestFlushByTimePeriod(t *testing.T) { + writer, _ := newBytesVerifier(t) + bufferedWriter, err := NewBufferedWriter(writer, 1024, 10) + + if err != nil { + t.Fatalf("Unexpected buffered writer creation error: %s", err.Error()) + } + + bytes := []byte("Hello") + + for i := 0; i < 2; i++ { + writer.ExpectBytes(bytes) + bufferedWriter.Write(bytes) + } +} + +func TestBigMessageMustPassMemoryBuffer(t *testing.T) { + writer, _ := newBytesVerifier(t) + bufferedWriter, err := NewBufferedWriter(writer, 1024, 0) + + if err != nil { + t.Fatalf("Unexpected buffered writer creation error: %s", err.Error()) + } + + bytes := make([]byte, 5000) + + for i := 0; i < len(bytes); i++ { + bytes[i] = uint8(i % 255) + } + + writer.ExpectBytes(bytes) + bufferedWriter.Write(bytes) +} http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d969e13b/traffic_stats/vendor/github.com/cihub/seelog/writers_connwriter.go -- diff --git a/traffic_stats/vendor/github.com/cihub/seelog b/traffic_stats/vendor/github.com/cihub/seelog deleted file mode 16 index 175e6e3..000 --- a/traffic_stats/vendor/github.com/cihub/seelog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 175e6e3d439fe2e1cee7ab652b12eb546c145a13 diff --git a/traffic_stats/vendor/github.com/cihub/seelog/writers_connwriter.go b/traffic_stats/vendor/github.com/cihub/seelog/writers_connwriter.go new file mode 100644 index 000..d199894 --- /dev/null +++ b/traffic_stats/vendor/github.com/cihub/seelog/writers_connwriter.go @@ -0,0 +1,144 @@ +// Copyright (c) 2012 - Cloud Instruments Co., Ltd. +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this +//list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright notice, +//this list of conditions and the following
[10/13] incubator-trafficcontrol git commit: Vendored github.com/cihub/seelog.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d969e13b/traffic_stats/vendor/github.com/cihub/seelog/LICENSE.txt -- diff --git a/traffic_stats/vendor/github.com/cihub/seelog b/traffic_stats/vendor/github.com/cihub/seelog deleted file mode 16 index 175e6e3..000 --- a/traffic_stats/vendor/github.com/cihub/seelog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 175e6e3d439fe2e1cee7ab652b12eb546c145a13 diff --git a/traffic_stats/vendor/github.com/cihub/seelog/LICENSE.txt b/traffic_stats/vendor/github.com/cihub/seelog/LICENSE.txt new file mode 100644 index 000..8c70681 --- /dev/null +++ b/traffic_stats/vendor/github.com/cihub/seelog/LICENSE.txt @@ -0,0 +1,24 @@ +Copyright (c) 2012, Cloud Instruments Co., Ltd.+All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +* Neither the name of the Cloud Instruments Co., Ltd. nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d969e13b/traffic_stats/vendor/github.com/cihub/seelog/README.markdown -- diff --git a/traffic_stats/vendor/github.com/cihub/seelog b/traffic_stats/vendor/github.com/cihub/seelog deleted file mode 16 index 175e6e3..000 --- a/traffic_stats/vendor/github.com/cihub/seelog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 175e6e3d439fe2e1cee7ab652b12eb546c145a13 diff --git a/traffic_stats/vendor/github.com/cihub/seelog/README.markdown b/traffic_stats/vendor/github.com/cihub/seelog/README.markdown new file mode 100644 index 000..7dd1ab3 --- /dev/null +++ b/traffic_stats/vendor/github.com/cihub/seelog/README.markdown @@ -0,0 +1,116 @@ +Seelog +=== + +Seelog is a powerful and easy-to-learn logging framework that provides functionality for flexible dispatching, filtering, and formatting log messages. +It is natively written in the [Go](http://golang.org/) programming language. + +[![Build Status](https://drone.io/github.com/cihub/seelog/status.png)](https://drone.io/github.com/cihub/seelog/latest) + +Features +-- + +* Xml configuring to be able to change logger parameters without recompilation +* Changing configurations on the fly without app restart +* Possibility to set different log configurations for different project files and functions +* Adjustable message formatting +* Simultaneous log output to multiple streams +* Choosing logger priority strategy to minimize performance hit +* Different output writers + * Console writer + * File writer + * Buffered writer (Chunk writer) + * Rolling log writer (Logging with rotation) + * SMTP writer + * Others... (See [Wiki](https://github.com/cihub/seelog/wiki)) +* Log message wrappers (JSON, XML, etc.) +* Global variables and functions for easy usage in standalone apps +* Functions for flexible usage in libraries + +Quick-start +--- + +```go +package main + +import log "github.com/cihub/seelog" + +func main() { +defer log.Flush() +log.Info("Hello from Seelog!") +} +``` + +Installation + + +If you don't have the Go development environment installed, visit the +[Getting Started](http://golang.org/doc/install.html) document and follow the instructions. Once you're ready, execute the following command: + +``` +go get -u github.com/cihub/seelog +``` + +*IMPORTANT*: If you are not using the latest release version of Go, check out this [wiki page](https://github.com/cihub/seelog/wiki/Notes-on-'go-get') + +Documentation +--- + +Seelog has github wiki pages, which contain detailed how-tos
[08/13] incubator-trafficcontrol git commit: Vendored github.com/cihub/seelog.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d969e13b/traffic_stats/vendor/github.com/cihub/seelog/common_constraints.go -- diff --git a/traffic_stats/vendor/github.com/cihub/seelog b/traffic_stats/vendor/github.com/cihub/seelog deleted file mode 16 index 175e6e3..000 --- a/traffic_stats/vendor/github.com/cihub/seelog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 175e6e3d439fe2e1cee7ab652b12eb546c145a13 diff --git a/traffic_stats/vendor/github.com/cihub/seelog/common_constraints.go b/traffic_stats/vendor/github.com/cihub/seelog/common_constraints.go new file mode 100644 index 000..7ec2fe5 --- /dev/null +++ b/traffic_stats/vendor/github.com/cihub/seelog/common_constraints.go @@ -0,0 +1,162 @@ +// Copyright (c) 2012 - Cloud Instruments Co., Ltd. +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this +//list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright notice, +//this list of conditions and the following disclaimer in the documentation +//and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package seelog + +import ( + "errors" + "fmt" + "strings" +) + +// Represents constraints which form a general rule for log levels selection +type logLevelConstraints interface { + IsAllowed(level LogLevel) bool +} + +// A minMaxConstraints represents constraints which use minimal and maximal allowed log levels. +type minMaxConstraints struct { + min LogLevel + max LogLevel +} + +// NewMinMaxConstraints creates a new minMaxConstraints struct with the specified min and max levels. +func NewMinMaxConstraints(min LogLevel, max LogLevel) (*minMaxConstraints, error) { + if min > max { + return nil, fmt.Errorf("min level can't be greater than max. Got min: %d, max: %d", min, max) + } + if min < TraceLvl || min > CriticalLvl { + return nil, fmt.Errorf("min level can't be less than Trace or greater than Critical. Got min: %d", min) + } + if max < TraceLvl || max > CriticalLvl { + return nil, fmt.Errorf("max level can't be less than Trace or greater than Critical. Got max: %d", max) + } + + return {min, max}, nil +} + +// IsAllowed returns true, if log level is in [min, max] range (inclusive). +func (minMaxConstr *minMaxConstraints) IsAllowed(level LogLevel) bool { + return level >= minMaxConstr.min && level <= minMaxConstr.max +} + +func (minMaxConstr *minMaxConstraints) String() string { + return fmt.Sprintf("Min: %s. Max: %s", minMaxConstr.min, minMaxConstr.max) +} + +//=== + +// A listConstraints represents constraints which use allowed log levels list. +type listConstraints struct { + allowedLevels map[LogLevel]bool +} + +// NewListConstraints creates a new listConstraints struct with the specified allowed levels. +func NewListConstraints(allowList []LogLevel) (*listConstraints, error) { + if allowList == nil { + return nil, errors.New("list can't be nil") + } + + allowLevels, err := createMapFromList(allowList) + if err != nil { + return nil, err + } + err = validateOffLevel(allowLevels) + if err != nil { + return nil, err + } + + return {allowLevels}, nil +} + +func (listConstr *listConstraints) String() string { + allowedList := "List: " + + listLevel := make([]string, len(listConstr.allowedLevels)) + + var logLevel LogLevel + i := 0 + for logLevel = TraceLvl; logLevel <= Off; logLevel++ { + if listConstr.allowedLevels[logLevel] { + listLevel[i] = logLevel.String() + i++ + } + } + + allowedList += strings.Join(listLevel, ",") + +
[2/4] incubator-trafficcontrol git commit: removes self-signed certs provided for convenience from TO UI experimental
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a4361c26/traffic_ops/experimental/ui/ssl/tls/certs/ssl-bundle.crt -- diff --git a/traffic_ops/experimental/ui/ssl/tls/certs/ssl-bundle.crt b/traffic_ops/experimental/ui/ssl/tls/certs/ssl-bundle.crt deleted file mode 100644 index 7b78dfc..000 --- a/traffic_ops/experimental/ui/ssl/tls/certs/ssl-bundle.crt +++ /dev/null @@ -1,10205 +0,0 @@ -# This is a bundle of X.509 certificates of public Certificate -# Authorities. It was generated from the Mozilla root CA list. -# -# Source: mozilla/security/nss/lib/ckfw/builtins/certdata.txt -# -# Generated from: -# $RCSfile: certdata.txt,v $ -# $Revision: 1.63 $ -# $Date: 2010/04/03 18:58:17 $ -# -Certificate: -Data: -Version: 3 (0x2) -Serial Number: -61:8d:c7:86:3b:01:82:05 -Signature Algorithm: sha1WithRSAEncryption -Issuer: CN=ACEDICOM Root, OU=PKI, O=EDICOM, C=ES -Validity -Not Before: Apr 18 16:24:22 2008 GMT -Not After : Apr 13 16:24:22 2028 GMT -Subject: CN=ACEDICOM Root, OU=PKI, O=EDICOM, C=ES -Subject Public Key Info: -Public Key Algorithm: rsaEncryption -Public-Key: (4096 bit) -Modulus: -00:ff:92:95:e1:68:06:76:b4:2c:c8:58:48:ca:fd: -80:54:29:55:63:24:ff:90:65:9b:10:75:7b:c3:6a: -db:62:02:01:f2:18:86:b5:7c:5a:38:b1:e4:58:b9: -fb:d3:d8:2d:9f:bd:32:37:bf:2c:15:6d:be:b5:f4: -21:d2:13:91:d9:07:ad:01:05:d6:f3:bd:77:ce:5f: -42:81:0a:f9:6a:e3:83:00:a8:2b:2e:55:13:63:81: -ca:47:1c:7b:5c:16:57:7a:1b:83:60:04:3a:3e:65: -c3:cd:01:de:de:a4:d6:0c:ba:8e:de:d9:04:ee:17: -56:22:9b:8f:63:fd:4d:16:0b:b7:7b:77:8c:f9:25: -b5:d1:6d:99:12:2e:4f:1a:b8:e6:ea:04:92:ae:3d: -11:b9:51:42:3d:87:b0:31:85:af:79:5a:9c:fe:e7: -4e:5e:92:4f:43:fc:ab:3a:ad:a5:12:26:66:b9:e2: -0c:d7:98:ce:d4:58:a5:95:40:0a:b7:44:9d:13:74: -2b:c2:a5:eb:22:15:98:10:d8:8b:c5:04:9f:1d:8f: -60:e5:06:1b:9b:cf:b9:79:a0:3d:a2:23:3f:42:3f: -6b:fa:1c:03:7b:30:8d:ce:6c:c0:bf:e6:1b:5f:bf: -67:b8:84:19:d5:15:ef:7b:cb:90:36:31:62:c9:bc: -02:ab:46:5f:9b:fe:1a:68:94:34:3d:90:8e:ad:f6: -e4:1d:09:7f:4a:88:38:3f:be:67:fd:34:96:f5:1d: -bc:30:74:cb:38:ee:d5:6c:ab:d4:fc:f4:00:b7:00: -5b:85:32:16:76:33:e9:d8:a3:99:9d:05:00:aa:16: -e6:f3:81:7d:6f:7d:aa:86:6d:ad:15:74:d3:c4:a2: -71:aa:f4:14:7d:e7:32:b8:1f:bc:d5:f1:4e:bd:6f: -17:02:39:d7:0e:95:42:3a:c7:00:3e:e9:26:63:11: -ea:0b:d1:4a:ff:18:9d:b2:d7:7b:2f:3a:d9:96:fb: -e8:1e:92:ae:13:55:c8:d9:27:f6:dc:48:1b:b0:24: -c1:85:e3:77:9d:9a:a4:f3:0c:11:1d:0d:c8:b4:14: -ee:b5:82:57:09:bf:20:58:7f:2f:22:23:d8:70:cb: -79:6c:c9:4b:f2:a9:2a:c8:fc:87:2b:d7:1a:50:f8: -27:e8:2f:43:e3:3a:bd:d8:57:71:fd:ce:a6:52:5b: -f9:dd:4d:ed:e5:f6:6f:89:ed:bb:93:9c:76:21:75: -f0:92:4c:29:f7:2f:9c:01:2e:fe:50:46:9e:64:0c: -14:b3:07:5b:c5:c2:73:6c:f1:07:5c:45:24:14:35: -ae:83:f1:6a:4d:89:7a:fa:b3:d8:2d:66:f0:36:87: -f5:2b:53 -Exponent: 65537 (0x10001) -X509v3 extensions: -X509v3 Basic Constraints: critical -CA:TRUE -X509v3 Authority Key Identifier: - keyid:A6:B3:E1:2B:2B:49:B6:D7:73:A1:AA:94:F5:01:E7:73:65:4C:AC:50 - -X509v3 Key Usage: critical -Digital Signature, Certificate Sign, CRL Sign -X509v3 Subject Key Identifier: -A6:B3:E1:2B:2B:49:B6:D7:73:A1:AA:94:F5:01:E7:73:65:4C:AC:50 -X509v3 Certificate Policies: -Policy: X509v3 Any Policy - CPS: http://acedicom.edicomgroup.com/doc - -Signature Algorithm: sha1WithRSAEncryption -ce:2c:0b:52:51:62:26:7d:0c:27:83:8f:c5:f6:da:a0:68:7b: -4f:92:5e:ea:a4:73:32:11:53:44:b2:44:cb:9d:ec:0f:79:42: -b3:10:a6:c7:0d:9d:cb:b6:fa:3f:3a:7c:ea:bf:88:53:1b:3c: -f7:82:fa:05:35:33:e1:35:a8:57:c0:e7:fd:8d:4f:3f:93:32: -4f:78:66:03:77:07:58:e9:95:c8:7e:3e:d0:79:00:8c:f2:1b: -51:33:9b:bc:94:e9:3a:7b:6e:52:2d:32:9e:23:a4:45:fb:b6: -2e:13:b0:8b:18:b1:dd:ce:d5:1d:a7:42:7f:55:be:fb:5b:bb: -47:d4:fc:24:cd:04:ae:96:05:15:d6:ac:ce:30:f3:ca:0b:c5: -ba:e2:22:e0:a6:ad:22:e4:02:ee:74:11:7f:4c:ff:78:1d:35: -da:e6:02:34:eb:18:12:61:77:06:09:16:63:ea:18:ad:a2:87: -
[4/4] incubator-trafficcontrol git commit: This closes #219.
This closes #219. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d97b715b Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d97b715b Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d97b715b Branch: refs/heads/master Commit: d97b715bd69bccc368706b4b1a1ea883ea32218a Parents: a4361c2 Author: Dan KirkwoodAuthored: Tue Jan 24 13:47:47 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 13:47:47 2017 -0700 -- --
[01/13] incubator-trafficcontrol git commit: Removed dependency gathering from traffic stats build.
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master d97b715bd -> c122ab40b Removed dependency gathering from traffic stats build. All the traffic stats dependencies are and ought to stay vendored, so the build should not go get dependencies. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5aec1345 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5aec1345 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5aec1345 Branch: refs/heads/master Commit: 5aec13455f04c34068f2c42abe3c61eb476e136c Parents: 283d0db Author: Chris LemmonsAuthored: Thu Jan 19 16:21:37 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 13:55:18 2017 -0700 -- traffic_stats/build/traffic_stats.spec | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5aec1345/traffic_stats/build/traffic_stats.spec -- diff --git a/traffic_stats/build/traffic_stats.spec b/traffic_stats/build/traffic_stats.spec index b6b28df..1f621e3 100644 --- a/traffic_stats/build/traffic_stats.spec +++ b/traffic_stats/build/traffic_stats.spec @@ -57,7 +57,6 @@ oldpwd=$(pwd) ( mkdir -p "$godir" && \ cd "$godir" && \ cp -L -r "$TC_DIR"/traffic_stats/* . && \ - go get -d -v && \ go install -v \ ) || { echo "Could not build go program at $(pwd): $!"; exit 1; }
[6/6] incubator-trafficcontrol git commit: This closes #233.
This closes #233. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5be5a7c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5be5a7c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5be5a7c9 Branch: refs/heads/master Commit: 5be5a7c9c6754415ed89bda6d12fd4a051423e25 Parents: bf13ace Author: Dan KirkwoodAuthored: Thu Jan 26 21:00:53 2017 -0700 Committer: Dan Kirkwood Committed: Thu Jan 26 21:00:53 2017 -0700 -- --
[2/6] incubator-trafficcontrol git commit: fixed sentence fragment
fixed sentence fragment Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3d867a3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3d867a3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3d867a3c Branch: refs/heads/master Commit: 3d867a3c13e03d2126648290eacfad2916ae87cf Parents: 194b683 Author: Dewayne RichardsonAuthored: Thu Jan 26 14:55:36 2017 -0700 Committer: Dan Kirkwood Committed: Thu Jan 26 20:59:43 2017 -0700 -- traffic_ops/app/db/pg-migration/migrate.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3d867a3c/traffic_ops/app/db/pg-migration/migrate.sh -- diff --git a/traffic_ops/app/db/pg-migration/migrate.sh b/traffic_ops/app/db/pg-migration/migrate.sh index 3cec4d2..1b73820 100755 --- a/traffic_ops/app/db/pg-migration/migrate.sh +++ b/traffic_ops/app/db/pg-migration/migrate.sh @@ -13,9 +13,9 @@ # limitations under the License. # -: ${TO_SERVER?"Please the TO_SERVER environment variable: ie: https://kabletown.net"} -: ${TO_USER?"Please the TO_USER environment variable: ie: "} -: ${TO_PASSWORD?"Please the TO_PASSWORD environment variable: ie: "} +: ${TO_SERVER?"Please set the TO_SERVER environment variable: ie: https://kabletown.net"} +: ${TO_USER?"Please set the TO_USER environment variable: ie: "} +: ${TO_PASSWORD?"Please set the TO_PASSWORD environment variable: ie: "} MYSQL_PORT=3306 POSTGRES_PORT=5432
[1/6] incubator-trafficcontrol git commit: fixed typo
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 41e653905 -> 5be5a7c9c fixed typo Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bf13ace6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bf13ace6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bf13ace6 Branch: refs/heads/master Commit: bf13ace6c1acb686f7bbe6a30cedd5c93502f3b7 Parents: 3d867a3 Author: Dewayne RichardsonAuthored: Thu Jan 26 14:56:19 2017 -0700 Committer: Dan Kirkwood Committed: Thu Jan 26 20:59:43 2017 -0700 -- traffic_ops/app/db/pg-migration/mysql-to-postgres.env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bf13ace6/traffic_ops/app/db/pg-migration/mysql-to-postgres.env -- diff --git a/traffic_ops/app/db/pg-migration/mysql-to-postgres.env b/traffic_ops/app/db/pg-migration/mysql-to-postgres.env index 5c3644b..8f343f1 100644 --- a/traffic_ops/app/db/pg-migration/mysql-to-postgres.env +++ b/traffic_ops/app/db/pg-migration/mysql-to-postgres.env @@ -32,8 +32,7 @@ MYSQL_USER=to_user MYSQL_PASSWORD=twelve MYSQL_RANDOM_ROOT_PASSWORD=yes -# The following -# New Producion Postgres Settings, these variables should be changed for the Postgres +# New production Postgres Settings, these variables should be changed for the Postgres # instance that will contain the existing MySQL data converted POSTGRES_HOST=( the_ip_address_running_this_migration ) POSTGRES_PORT=5432
[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: peryderAuthored: Thu Dec 15 16:14:56 2016 -0500 Committer: Dan Kirkwood 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":"175", + "Health Threshold Available Bandwidth in Kbps":">175", "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)
[02/36] incubator-trafficcontrol git commit: Changed database to pg and made downloading maxmind database optional defaulting to yes
Changed database to pg and made downloading maxmind database optional defaulting to yes Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2f73509c Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2f73509c Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2f73509c Branch: refs/heads/master Commit: 2f73509c900146dd2afee3ff299b1e238a2f4c3b Parents: 2ab71fd Author: peter.w.ryderAuthored: Fri Jan 20 09:34:10 2017 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/input.json | 11 ++-- traffic_ops/install/bin/postinstall | 47 2 files changed, 33 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2f73509c/traffic_ops/install/bin/input.json -- diff --git a/traffic_ops/install/bin/input.json b/traffic_ops/install/bin/input.json index 31b126f..136dfa7 100644 --- a/traffic_ops/install/bin/input.json +++ b/traffic_ops/install/bin/input.json @@ -1,7 +1,7 @@ { "/opt/traffic_ops/app/conf/production/database.conf":[ { - "Database type":"mysql", + "Database type":"pg", "config_var":"type" }, { @@ -24,6 +24,10 @@ "Traffic Ops database password":"default", "config_var":"password", "hidden":"1" +}, +{ + "Download Maxmind Database?":"yes", + "config_var":"maxmind" } ], "/opt/traffic_ops/app/db/dbconf.yml":[ @@ -82,7 +86,10 @@ } ], "/opt/traffic_ops/install/data/profiles/":[ - +{ + "Add custom profiles?":"no", + "config_var":"custom_profiles" +} ], "/opt/traffic_ops/install/data/json/openssl_configuration.json":[ { http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2f73509c/traffic_ops/install/bin/postinstall -- diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall index 0f187b8..f1aa23f 100755 --- a/traffic_ops/install/bin/postinstall +++ b/traffic_ops/install/bin/postinstall @@ -87,7 +87,7 @@ my $automatic = 0; my $defaultInputs; sub getDbDriver { -return "mymysql"; +return "pg"; } sub getInstallPath { @@ -407,6 +407,10 @@ sub getDefaults { "Password for Traffic Ops database user" => "", "config_var" => "password", "hidden" => "true" +}, +{ +"Download Maxmind Database?" => "yes", +"config_var" => "maxmind" } ], $dbConfFile => [ @@ -464,7 +468,12 @@ sub getDefaults { "hidden" => "true" } ], -$profilesConfFile => [], +$profilesConfFile => [ +{ +"Add custom profiles?" =>"no", +"config_var" => "custom_profiles" +} +], $opensslConfFile => [ { "Do you want to generate a certificate?" => "yes", @@ -559,19 +568,11 @@ sub setupDatabase { my $todbconf= shift; my $opensslconf = shift; my $genCert = shift; - -# -# Call mysql initialization script. -# -InstallUtils::logger( "Creating database with user: $todbconf->{dbAdminUser}", "info" ); -my $result = InstallUtils::execCommand( "/opt/traffic_ops/install/bin/create_db", $todbconf->{dbAdminUser}, $todbconf->{dbAdminPw} ); -if ( $result != 0 ) { -errorOut("Failed to create the database"); -} +my $setupMaxmind = shift; InstallUtils::logger( "Setting up database", "info" ); chdir("/opt/traffic_ops/app"); -$result = InstallUtils::execCommand( "/usr/bin/perl", "db/admin.pl", "--env=production", "setup" ); +my $result = InstallUtils::execCommand( "/usr/bin/perl", "db/admin.pl", "--env=production", "setup" ); if ( $result != 0 ) { errorOut("Database initialization failed"); @@ -580,16 +581,16 @@ sub setupDatabase { InstallUtils::logger( "Database initialization succeeded", "info" ); } -$result = InstallUtils::execCommand( "/opt/traffic_ops/install/bin/dataload", $todbconf->{dbAdminUser}, $todbconf->{dbAdminPw} ); -if ( $result != 0 ) { -InstallUtils::logger( "Failed to load seed data", "error" ); +if ($setupMaxmind =~ /^y(?:es)?/) { +InstallUtils::logger( "Downloading Maxmind data", "info" ); +chdir("/opt/traffic_ops/app/public/routing"); +$result =
[24/36] incubator-trafficcontrol git commit: Added apache license to postinstall-new-integrated
Added apache license to postinstall-new-integrated Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/70545613 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/70545613 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/70545613 Branch: refs/heads/master Commit: 70545613b5f66d35429a9f9b205a0a12d4067829 Parents: 831d58d Author: peryderAuthored: Wed Dec 7 10:22:34 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new-integrated | 14 ++ 1 file changed, 14 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/70545613/traffic_ops/install/bin/postinstall-new-integrated -- diff --git a/traffic_ops/install/bin/postinstall-new-integrated b/traffic_ops/install/bin/postinstall-new-integrated index cc6ec82..9972daa 100755 --- a/traffic_ops/install/bin/postinstall-new-integrated +++ b/traffic_ops/install/bin/postinstall-new-integrated @@ -1,5 +1,19 @@ #!/usr/bin/perl +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# 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); $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";
[16/36] incubator-trafficcontrol git commit: Removed comcast copyright line
Removed comcast copyright line Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/0ab8be76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0ab8be76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0ab8be76 Branch: refs/heads/master Commit: 0ab8be76f6934fd4a8961d3425647dc19df219f8 Parents: c265743 Author: peryderAuthored: Fri Dec 2 14:28:25 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/lib/BuildPerlDeps.pm | 2 -- traffic_ops/install/lib/GenerateCert.pm | 2 -- 2 files changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0ab8be76/traffic_ops/install/lib/BuildPerlDeps.pm -- diff --git a/traffic_ops/install/lib/BuildPerlDeps.pm b/traffic_ops/install/lib/BuildPerlDeps.pm index 302d5c3..b3126bc 100644 --- a/traffic_ops/install/lib/BuildPerlDeps.pm +++ b/traffic_ops/install/lib/BuildPerlDeps.pm @@ -1,7 +1,5 @@ #!/usr/bin/perl # -# Copyright 2015 Comcast Cable Communications Management, LLC -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0ab8be76/traffic_ops/install/lib/GenerateCert.pm -- diff --git a/traffic_ops/install/lib/GenerateCert.pm b/traffic_ops/install/lib/GenerateCert.pm index efdcc96..0d4a458 100644 --- a/traffic_ops/install/lib/GenerateCert.pm +++ b/traffic_ops/install/lib/GenerateCert.pm @@ -1,8 +1,6 @@ #!/usr/bin/perl # -# Copyright 2015 Comcast Cable Communications Management, LLC -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at
[27/36] incubator-trafficcontrol git commit: Removed creation of reconfigure file
Removed creation of reconfigure file Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/19d760ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/19d760ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/19d760ab Branch: refs/heads/master Commit: 19d760ab56ab42e85ef4edbe63393dc280b0a3af Parents: a3433b0 Author: peryderAuthored: Thu Dec 8 16:21:27 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/build/traffic_ops.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/19d760ab/traffic_ops/build/traffic_ops.spec -- diff --git a/traffic_ops/build/traffic_ops.spec b/traffic_ops/build/traffic_ops.spec index b1ca3f6..4483aa2 100644 --- a/traffic_ops/build/traffic_ops.spec +++ b/traffic_ops/build/traffic_ops.spec @@ -109,7 +109,7 @@ Built: %(date) by %{getenv: USER} # install if [ "$1" = "1" ]; then # see postinstall, the .reconfigure file triggers init(). - /bin/touch %{PACKAGEDIR}/.reconfigure + #/bin/touch %{PACKAGEDIR}/.reconfigure echo -e "\nRun /opt/traffic_ops/install/bin/postinstall from the root home directory to complete the install.\n" fi
[36/36] incubator-trafficcontrol git commit: ran perltidy
ran perltidy Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2ab71fdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2ab71fdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2ab71fdd Branch: refs/heads/master Commit: 2ab71fdd0958f32401f860e0bab4765908b6ac09 Parents: 230aa7c Author: peter.w.ryderAuthored: Thu Jan 12 15:14:46 2017 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall | 10 +- traffic_ops/install/lib/InstallUtils.pm | 2 +- traffic_ops/install/lib/ProfileCleanup.pm | 24 3 files changed, 18 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2ab71fdd/traffic_ops/install/bin/postinstall -- diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall index 2f6f3d7..0f187b8 100755 --- a/traffic_ops/install/bin/postinstall +++ b/traffic_ops/install/bin/postinstall @@ -58,7 +58,7 @@ my $post_install_cfg = "/opt/traffic_ops/install/data/json/post_install.json"; my $logFile = "/var/log/traffic_ops/postinstall.log"; # debug mode -my $debug = 0; +my $debug = 0; # log file for cpan output my $cpanLogFile = "/var/log/traffic_ops/cpan.log"; @@ -721,7 +721,7 @@ sub main { chdir("/opt/traffic_ops/install/bin"); # if reconfigure is set then rebuild the perl deps -if ( $reconfigure ) { +if ($reconfigure) { my $rc = BuildPerlDeps::build( 1, $cpanLogFile ); if ( $rc != 0 ) { errorOut("Failed to install perl dependencies, check the console output and rerun postinstall once you've resolved the error"); @@ -756,8 +756,8 @@ sub main { InstallUtils::writeJson( $post_install_cfg, $paramconf ); # if reconfigure is set then setup the database -if ( $reconfigure ) { -if ( $automatic ) { +if ($reconfigure) { +if ($automatic) { setupDatabase( $todbconf, $opensslConfFile, $opensslconf->{genCert} ); } else { @@ -770,7 +770,7 @@ sub main { InstallUtils::logger( "Waiting for Traffic Ops to start", "info" ); -if (-f $post_install_cfg) { +if ( -f $post_install_cfg ) { $parameters = InstallUtils::readJson($post_install_cfg); } http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2ab71fdd/traffic_ops/install/lib/InstallUtils.pm -- diff --git a/traffic_ops/install/lib/InstallUtils.pm b/traffic_ops/install/lib/InstallUtils.pm index 555ba84..7ba24d5 100644 --- a/traffic_ops/install/lib/InstallUtils.pm +++ b/traffic_ops/install/lib/InstallUtils.pm @@ -241,7 +241,7 @@ sub readJson { sub writeJson { my $file = shift; open( my $fh, '>', $file ) or die("open(): $!"); -logger("Writing json to $file", "info"); +logger( "Writing json to $file", "info" ); foreach my $data (@_) { my $json_text = JSON->new->utf8->pretty->encode($data); print $fh $json_text, "\n"; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2ab71fdd/traffic_ops/install/lib/ProfileCleanup.pm -- diff --git a/traffic_ops/install/lib/ProfileCleanup.pm b/traffic_ops/install/lib/ProfileCleanup.pm index 4885a11..d9828cc 100644 --- a/traffic_ops/install/lib/ProfileCleanup.pm +++ b/traffic_ops/install/lib/ProfileCleanup.pm @@ -135,7 +135,7 @@ sub profile_import_single { } sub import_profiles { -my $toUri = shift; +my $toUri = shift; my $adminconf = shift; my $profileDir = shift; @@ -226,25 +226,25 @@ sub profiles_exist { sub add_custom_profiles { my $custom_profile_dir = shift; -my $adminconf = shift; -my $toUri = shift; +my $adminconf = shift; +my $toUri = shift; -return if (! -e $custom_profile_dir ); +return if ( !-e $custom_profile_dir ); -opendir(DH, $custom_profile_dir) || return; +opendir( DH, $custom_profile_dir ) || return; my @profiles = readdir(DH); closedir(DH); -@profiles = grep(/^profile\..*\.traffic_ops$/, @profiles); +@profiles = grep( /^profile\..*\.traffic_ops$/, @profiles ); -return if (scalar @profiles == 0); +return if ( scalar @profiles == 0 ); -my $toUser = $adminconf->{tmAdminUser}; -my $toPass = $adminconf->{tmAdminPw}; -my $toCookie = get_traffic_ops_cookie($toUri, $toUser, $toPass); +my $toUser = $adminconf->{tmAdminUser}; +my $toPass =
[12/36] incubator-trafficcontrol git commit: Fixed formatting
Fixed formatting Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bac2db29 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bac2db29 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bac2db29 Branch: refs/heads/master Commit: bac2db29122674ac9bff366710704b37914be848 Parents: 7046baa Author: peryderAuthored: Tue Nov 15 13:58:17 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new | 60 1 file changed, 25 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bac2db29/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new index ce5fe9c..83e6d63 100755 --- a/traffic_ops/install/bin/postinstall-new +++ b/traffic_ops/install/bin/postinstall-new @@ -1,10 +1,8 @@ #!/usr/bin/perl -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); -$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 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); +$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; @@ -47,7 +45,7 @@ sub getField { my $config_answer = shift; my $fileName = shift; -# if there is no config file and not in automatic mode prompt for all questions with default answers +# if there is no config file and not in automatic mode prompt for all questions with default answers if ( $::inputFile eq "" && !$::automatic ) { return promptUser( $question, $config_answer ); } @@ -97,10 +95,11 @@ sub getConfig { } foreach my $var ( @{ $userInput->{$fileName} } ) { -my $question = - ( ( keys $var )[0] eq "config_var" +my $question = ( + ( keys $var )[0] eq "config_var" ? ( keys $var )[1] -: ( keys $var )[0] ); +: ( keys $var )[0] +); my $answer = $config{ $var->{"config_var"} } = getField( $question, $var->{$question}, $fileName ); @@ -141,8 +140,7 @@ sub generateDbConf { print $fh "name: dbconf.yml\n\n"; print $fh "production:\n"; print $fh "driver: ", getDbDriver() . "\n"; -print $fh -"open: tcp:$dbconf{hostname}:$dbconf{port}*$dbconf{dbname}/$dbconf{root_user}/$dbconf{root_passwd}\n"; +print $fh "open: tcp:$dbconf{hostname}:$dbconf{port}*$dbconf{dbname}/$dbconf{root_user}/$dbconf{root_passwd}\n"; close $fh; return \%todbconf; @@ -241,24 +239,21 @@ sub generateProfilesDir { sub sanityCheckDefaults { foreach my $file ( ( keys $::defaultInputs ) ) { foreach my $defaultValue ( @{ $::defaultInputs->{$file} } ) { -my $question = - ( ( keys $defaultValue )[0] eq "config_var" +my $question = ( + ( keys $defaultValue )[0] eq "config_var" ? ( keys $defaultValue )[1] -: ( keys $defaultValue )[0] ); +: ( keys $defaultValue )[0] +); if ( !defined $defaultValue->{$question} || $defaultValue->{$question} eq "" ) { -errorOut( -"Error: question \'$question\' in file \'$file\' has no default answer\n" -); +errorOut( "Error: question \'$question\' in file \'$file\' has no default answer\n" ); } if ( !defined $defaultValue->{"config_var"} || $defaultValue->{"config_var"} eq "" ) { -errorOut( -"Error: question \'$question\' in file \'$file\' has no config_var" -); +errorOut( "Error: question \'$question\' in file \'$file\' has no config_var" ); } } } @@ -278,8 +273,7 @@ sub sanityCheckConfig { foreach my $file ( ( keys $::defaultInputs ) ) { if ( !defined $userInput->{$file} ) { -print - "Warning: File \'$file\' found in defaults but not config file\n"; +print "Warning: File \'$file\'
[18/36] incubator-trafficcontrol git commit: Added apache license to added files
Added apache license to added 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/fcd93ba7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fcd93ba7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fcd93ba7 Branch: refs/heads/master Commit: fcd93ba76c090c52bf458497abfe95a209118005 Parents: e6a3122 Author: peryderAuthored: Mon Dec 5 18:52:37 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new | 13 + traffic_ops/install/lib/BuildPerlDeps.pm | 5 +++-- traffic_ops/install/lib/InstallUtils.pm | 11 +++ traffic_ops/install/lib/ProfileCleanup.pm | 14 ++ 4 files changed, 41 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fcd93ba7/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new index cb4cc56..2d22fcf 100755 --- a/traffic_ops/install/bin/postinstall-new +++ b/traffic_ops/install/bin/postinstall-new @@ -1,4 +1,17 @@ #!/usr/bin/perl +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# 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); $ENV{PATH} = "/opt/traffic_ops/install/bin:$ENV{PATH}"; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fcd93ba7/traffic_ops/install/lib/BuildPerlDeps.pm -- diff --git a/traffic_ops/install/lib/BuildPerlDeps.pm b/traffic_ops/install/lib/BuildPerlDeps.pm index e127d07..7c20845 100644 --- a/traffic_ops/install/lib/BuildPerlDeps.pm +++ b/traffic_ops/install/lib/BuildPerlDeps.pm @@ -1,4 +1,5 @@ #!/usr/bin/perl + # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,10 +14,10 @@ # 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 lib qw(/opt/traffic_ops/install/lib /opt/traffic_ops/lib/perl5 /opt/traffic_ops/app/lib); + use InstallUtils qw{ :all }; use base qw{ Exporter }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fcd93ba7/traffic_ops/install/lib/InstallUtils.pm -- diff --git a/traffic_ops/install/lib/InstallUtils.pm b/traffic_ops/install/lib/InstallUtils.pm index a30042f..452a4d9 100644 --- a/traffic_ops/install/lib/InstallUtils.pm +++ b/traffic_ops/install/lib/InstallUtils.pm @@ -1,6 +1,17 @@ +#!/usr/bin/perl + # +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # package InstallUtils; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fcd93ba7/traffic_ops/install/lib/ProfileCleanup.pm -- diff --git a/traffic_ops/install/lib/ProfileCleanup.pm b/traffic_ops/install/lib/ProfileCleanup.pm index 0baecb7..eab10a1 100644 --- a/traffic_ops/install/lib/ProfileCleanup.pm +++ b/traffic_ops/install/lib/ProfileCleanup.pm @@ -1,3 +1,17 @@ +#!/usr/bin/perl +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the
[29/36] incubator-trafficcontrol git commit: Added question for cert generation to input.json
Added question for cert generation to input.json Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/6e0b9165 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6e0b9165 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6e0b9165 Branch: refs/heads/master Commit: 6e0b916553520fef1d0a15f35af03679a8bc71a0 Parents: be8df01 Author: peryderAuthored: Tue Dec 13 15:21:30 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/input.json | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6e0b9165/traffic_ops/install/bin/input.json -- diff --git a/traffic_ops/install/bin/input.json b/traffic_ops/install/bin/input.json index 9978acb..e613a3a 100644 --- a/traffic_ops/install/bin/input.json +++ b/traffic_ops/install/bin/input.json @@ -85,6 +85,10 @@ ], "/opt/traffic_ops/install/bin/openssl_configuration.json":[ +{ + "Do you want to generate a certificate?": "yes", + "config_var": "genCert" +}, { "Country Name (2 letter code)":"XX", "config_var":"country" @@ -161,4 +165,4 @@ "config_var":"health_connect_timeout" } ] -} \ No newline at end of file +}
[31/36] incubator-trafficcontrol git commit: Added description to database.conf
Added description to database.conf Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2778409e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2778409e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2778409e Branch: refs/heads/master Commit: 2778409efa0d8c86dd9335742f11b2b158e9d999 Parents: c83a26b Author: peryderAuthored: Mon Dec 19 14:56:31 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new | 2 +- traffic_ops/install/lib/ProfileCleanup.pm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2778409e/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new index d345663..08ba7a7 100755 --- a/traffic_ops/install/bin/postinstall-new +++ b/traffic_ops/install/bin/postinstall-new @@ -162,7 +162,7 @@ sub generateDbConf { my $toDBFileName = shift; my %dbconf = getConfig( $userInput, $dbFileName ); - +$dbconf{"description"} = "$dbconf{type} database on $dbconf{hostname}:$dbconf{port}"; make_path( dirname($dbFileName), { mode => 0755 } ); writeJson( $dbFileName, \%dbconf ); logger( "Database configuration has been saved", "info" ); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2778409e/traffic_ops/install/lib/ProfileCleanup.pm -- diff --git a/traffic_ops/install/lib/ProfileCleanup.pm b/traffic_ops/install/lib/ProfileCleanup.pm index 1e6edf9..3f7ce4a 100644 --- a/traffic_ops/install/lib/ProfileCleanup.pm +++ b/traffic_ops/install/lib/ProfileCleanup.pm @@ -27,6 +27,7 @@ our %EXPORT_TAGS = ( all => \@EXPORT_OK ); sub profile_replace { my ($profile) = @_; my $profile_bak = $profile . ".bak"; +logger("Replacing parameters in profile: $profile", "info"); rename( $profile, $profile_bak ) or die("rename(): $!"); open( my $fh, '<', $profile_bak ) or die("open(): $!"); open( my $ofh, '>', $profile ) or die("open(): $!");
[23/36] incubator-trafficcontrol git commit: Added apache license to ProfileCleanup
Added apache license to ProfileCleanup Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/831d58d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/831d58d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/831d58d2 Branch: refs/heads/master Commit: 831d58d2350a32d0e0b3714332e1388c6bad21b8 Parents: d665814 Author: peryderAuthored: Wed Dec 7 10:21:01 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/lib/ProfileCleanup.pm | 15 +++ 1 file changed, 15 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/831d58d2/traffic_ops/install/lib/ProfileCleanup.pm -- diff --git a/traffic_ops/install/lib/ProfileCleanup.pm b/traffic_ops/install/lib/ProfileCleanup.pm index 3fe6220..1e6edf9 100644 --- a/traffic_ops/install/lib/ProfileCleanup.pm +++ b/traffic_ops/install/lib/ProfileCleanup.pm @@ -1,3 +1,18 @@ +#!/usr/bin/perl + +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# package ProfileCleanup;
[09/36] incubator-trafficcontrol git commit: Several minor updates to sanityCheck
Several minor updates to sanityCheck Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ce47eb81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ce47eb81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ce47eb81 Branch: refs/heads/master Commit: ce47eb817e9abc489368951259275a52c391ba6a Parents: 034a587 Author: peryderAuthored: Mon Nov 14 14:16:49 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new | 38 1 file changed, 22 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ce47eb81/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new index 0228b5a..6d3ca0f 100755 --- a/traffic_ops/install/bin/postinstall-new +++ b/traffic_ops/install/bin/postinstall-new @@ -53,7 +53,7 @@ sub getField { # if no config value and in interactive mode prompt user if ($::interactive) { return promptUser($question); -} + } # if no answer given in input file attempt to use default answer foreach my $var (@{ $::defaultInputs->{$fileName} }) { @@ -63,7 +63,7 @@ sub getField { } #No way of getting answer - errorOut("No config answer given\n"); + errorOut("No config answer given for question \'$question\'\n"); } errorOut("error: end of function"); @@ -90,8 +90,8 @@ sub getConfig { } foreach my $var (@{ $userInput->{$fileName} }) { - my $question = ( (keys $var)[0] eq "config_var" ? (keys $var)[1] : (keys $var)[0] ); - my $answer = $config{$var->{"config_var"}} = getField($question, $var->{$question}, $fileName); + my $question = ( (keys $var)[0] eq "config_var" ? (keys $var)[1] : (keys $var)[0] ); + my $answer = $config{$var->{"config_var"}} = getField($question, $var->{$question}, $fileName); $config{$var->{"config_var"}} = $answer; if ($::debug) { @@ -149,7 +149,7 @@ sub generateCdnConf { my %cdnconf = getConfig($userInput, $fileName); if (! looks_like_number($cdnconf{keepSecrets}) ) { - errorOut("Number of secrets to keep must be a number\n"); + errorOut("Error: Number of secrets to keep must be a number\n"); } if ( lc $cdnconf{genSecret} =~ /^y(?:es)?/ ) { @@ -223,8 +223,8 @@ sub generateProfilesDir { # userInput: The entire input config file which is either user input or the defaults # -# Checks the input config file against the default inputs. If there is a question located in the input config file -# which is not present in the defaults it will output a warning message. +# Checks the input config file against the default inputs. If there is a question located in the default inputs which +# is not located in the input config file it will output a warning message. # # This does not check the other way meaning questions which are present in defaults but not present in the input config # file will not be checked @@ -233,19 +233,25 @@ sub sanityCheckConfig { my $userInput = shift; my $diffs = 0; - foreach my $file ( (keys $userInput) ) { - if (!defined $::defaultInputs->{$file}) { - print "Warning: File \'$file\' found in input but not defaults\n"; + foreach my $file ( (keys $::defaultInputs) ) { + if (!defined $userInput->{$file}) { + print "Warning: File \'$file\' found in defaults but not config file\n"; next; } - my $counter = 0; - foreach my $value (@ { $userInput->{$file} }) { - if ( !defined $::defaultInputs->{$file}[$counter]->{"config_var"} ) { - print "Warning: Value " . Dumper($value) . "found in file \'$file\' but not defaults\n"; - $diffs++; + foreach my $defaultValue (@ { $::defaultInputs->{$file} }) { + + my $found = 0; + foreach my $configValue (@ { $userInput->{$file} }) { + if ($defaultValue->{"config_var"} eq $configValue->{"config_var"} ) {
[25/36] incubator-trafficcontrol git commit: Removed 2nd check for root access in postinstall-new
Removed 2nd check for root access in postinstall-new Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a3433b05 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a3433b05 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a3433b05 Branch: refs/heads/master Commit: a3433b05d2ddc4683bfedd67f65fc8b83240a5a4 Parents: 62da24d Author: peryderAuthored: Wed Dec 7 12:43:58 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a3433b05/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new index 9972daa..c5ffeef 100755 --- a/traffic_ops/install/bin/postinstall-new +++ b/traffic_ops/install/bin/postinstall-new @@ -669,11 +669,6 @@ sub main { logger( "Postinstall " . ( defined $reconfigure ? "in" : "not" ) . " in reconfigure mode", "info" ); -# check if the user has root access -if ( $ENV{USER} ne "root" ) { -errorOut("You must run this script as the root user"); -} - rotateLog($cpanLogFile); if ( -s $::logFile > $maxLogSize ) {
[33/36] incubator-trafficcontrol git commit: Changed format of dbconf.yml to more closely match format of old postinstall
Changed format of dbconf.yml to more closely match format of old postinstall Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ed582864 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ed582864 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ed582864 Branch: refs/heads/master Commit: ed5828644972949b054ce5d1ddab121655eb7df9 Parents: 2778409 Author: peryderAuthored: Mon Dec 19 15:06:29 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ed582864/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new index 08ba7a7..1092338 100755 --- a/traffic_ops/install/bin/postinstall-new +++ b/traffic_ops/install/bin/postinstall-new @@ -172,11 +172,9 @@ sub generateDbConf { # No YAML library installed, but this is a simple file.. open( my $fh, '>', $toDBFileName ) or errorOut("Can't write to $toDBFileName!"); -print $fh "version: 1.0\n"; -print $fh "name: dbconf.yml\n\n"; print $fh "production:\n"; -print $fh "driver: ", getDbDriver() . "\n"; -print $fh "open: tcp:$dbconf{hostname}:$dbconf{port}*$dbconf{dbname}/$dbconf{user}/$dbconf{password}\n"; +print $fh "driver: ", getDbDriver() . "\n"; +print $fh "open: tcp:$dbconf{hostname}:$dbconf{port}*$dbconf{dbname}/$dbconf{user}/$dbconf{password}\n"; close $fh; return \%todbconf;
[13/36] incubator-trafficcontrol git commit: Added logging and outputs config file which can be used as input
Added logging and outputs config file which can be used as input Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/4a2657bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/4a2657bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/4a2657bb Branch: refs/heads/master Commit: 4a2657bbba5564ce55161f8aecc87f24baedb264 Parents: bac2db2 Author: peryderAuthored: Tue Nov 22 16:27:35 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new | 294 +-- 1 file changed, 137 insertions(+), 157 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4a2657bb/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new index 83e6d63..b97d58d 100755 --- a/traffic_ops/install/bin/postinstall-new +++ b/traffic_ops/install/bin/postinstall-new @@ -9,6 +9,7 @@ use warnings; use Safe; use JSON; +use POSIX; use File::Basename qw{dirname}; use File::Path qw{make_path}; use InstallUtils qw{ :all }; @@ -18,8 +19,41 @@ use Scalar::Util qw(looks_like_number); use Getopt::Long; +# paths of the output configuration files +our $databaseConfFile = "testdb.conf"; +our $dbConfFile = "testdbconf.yml"; +our $cdnConfFile = "testcdn.conf"; +our $ldapConfFile = "testldap.conf"; +our $usersConfFile= "testusers.json"; +our $profilesConfFile = "testprofiles.json"; + +# log file for the installer +our $logFile = "/var/log/traffic_ops/postinstall.log"; + +# configuration file output with answers which can be used as input to postinstall +our $outputConfigFile = "/var/log/traffic_ops/configuration_file.json"; + sub errorOut { -die @_; +logger( @_, "error" ); +die; +} + +# outputs logging messages to terminal and log file +sub logger { +my $output = shift; +my $type = shift; + +my $message = $output . "\n"; + +# if in debug mode or message is more critical than info print to console +if ( $::debug || ( defined $type && $type ne "" && $type ne "info" ) ) { +print($message); +} + +# output to log file +open my $fh, '>>', $::logFile or errorOut("Couldn't open log file"); +print $fh localtime . ": " . uc($type) . ' ' . $message; +close $fh; } sub getDbDriver { @@ -31,6 +65,12 @@ sub getInstallPath { return join( '/', "/tmp/traffic_ops", $relPath ); } +# given a var to the hash of config_var and question, will return the question +sub getConfigQuestion { +my $var = shift; +return ( keys $var )[0] eq "config_var" ? ( keys $var )[1] : ( keys $var )[0]; +} + # question: The question given in the config file # config_answer: The answer given in the config file - if no config file given will be defaultInput # fileName: The name of the output config file given by the input config file @@ -46,32 +86,11 @@ sub getField { my $fileName = shift; # if there is no config file and not in automatic mode prompt for all questions with default answers -if ( $::inputFile eq "" && !$::automatic ) { +if ( !$::inputFile && !$::automatic ) { return promptUser( $question, $config_answer ); } -# if answer provided in config file use it -if ($config_answer) { -return $config_answer; -} -else { -# if no config value and not in automatic mode prompt user -if ( !$::automatic ) { -return promptUser($question); -} - -# if no answer given in input file attempt to use default answer -foreach my $var ( @{ $::defaultInputs->{$fileName} } ) { -if ( defined $var->{$question} && $var->{$question} ne "" ) { -return $var->{$question}; -} -} - -#No way of getting answer -errorOut("No config answer given for question \'$question\'\n"); -} - -errorOut("error: end of function"); +return $config_answer; } # userInput: The entire input config file which is either user input or the defaults @@ -87,27 +106,22 @@ sub getConfig { my %config; if ( !defined $userInput->{$fileName} ) { -print "Error: No $fileName found in config\n"; +logger( "No $fileName found in config", "error" ); } -if ($::debug) { -print "===$fileName===\n"; -} +logger( "===$fileName===", "info" ); +my $counter = 0; foreach my $var ( @{ $userInput->{$fileName} } ) { -my $question = ( - ( keys $var )[0] eq
[20/36] incubator-trafficcontrol git commit: Reset build_trafficops_perl_library
Reset build_trafficops_perl_library Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/832a50f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/832a50f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/832a50f3 Branch: refs/heads/master Commit: 832a50f3320cf18c50b4f186683b138d2324a167 Parents: 5bcd2be Author: peryderAuthored: Wed Dec 7 10:09:39 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- .../install/bin/build_trafficops_perl_library | 138 --- 1 file changed, 60 insertions(+), 78 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/832a50f3/traffic_ops/install/bin/build_trafficops_perl_library -- diff --git a/traffic_ops/install/bin/build_trafficops_perl_library b/traffic_ops/install/bin/build_trafficops_perl_library index 0bca5e9..684916d 100755 --- a/traffic_ops/install/bin/build_trafficops_perl_library +++ b/traffic_ops/install/bin/build_trafficops_perl_library @@ -1,13 +1,12 @@ #!/usr/bin/perl # -# Copyright 2015 Comcast Cable Communications Management, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,13 +17,15 @@ use strict; use warnings; use Getopt::Std; +use InstallUtils; our ($opt_i); -my @dependencies = ("expat-devel","mod_ssl","mkisofs","libpcap","libpcap-devel", - "libcurl","libcurl-devel","mysql-server","mysql-devel", - "openssl","openssl-devel","cpan","gcc","make","pkgconfig","automake","autoconf", - "libtool","gettext","libidn-devel"); +my @dependencies = ( + "expat-devel", "mod_ssl", "mkisofs", "libpcap", "libpcap-devel", "libcurl", + "libcurl-devel", "mysql-server", "mysql-devel", "openssl", "cpan", "gcc", + "make", "pkgconfig","automake","autoconf", "libtool", "gettext" +); my $msg = << 'EOF'; This script will build and package the required Traffic Ops perl modules. @@ -33,55 +34,36 @@ compiler will be installed on this machine. EOF -sub execCommand { - my ($command, @args) = @_; - my $pid = fork (); - my $result = 0; +sub promptUser { + my ( $promptString, $defaultValue, $noEcho ) = @_; - if ($pid == 0) { - exec ($command, @args); - exit 0; + if ($defaultValue) { + print $promptString, " [", $defaultValue, "]: "; } else { - wait; - $result = $?; - if ($result != 0) { - print "ERROR executing: $command, args: " . join (' ', @args) . "\n"; + print $promptString, ": "; + } + + if ( defined $noEcho && $noEcho ) { + my $response = read_password(''); + if ( ( !defined $response || $response eq '' ) && ( defined $defaultValue && $defaultValue ne '' ) ) { + $response = $defaultValue; } + return $response; } - return $result; -} + else { + $| = 1; + $_ = ; + chomp; -sub promptUser { -my ($promptString, $defaultValue, $noEcho) = @_; - -if ($defaultValue) { -print $promptString, " [", $defaultValue, "]: "; -} -else { -print $promptString, ": "; -} - -if (defined $noEcho && $noEcho) { -my $response = read_password(''); -if ((!defined $response || $response eq '') && (defined $defaultValue && $defaultValue ne '')) { -$response = $defaultValue; -} -return $response -} -else { -$| = 1; -$_ = ; -chomp; - -if ("$defaultValue") { -return $_ ? $_ : $defaultValue; -} -else { -return $_; -} -return $_; -} + if ("$defaultValue") { + return $_ ? $_ : $defaultValue; + } + else { + return $_; + } + return $_; + } } sub trim { @@ -99,69 +81,69 @@ my $result; ## MAIN ## #
[06/36] incubator-trafficcontrol git commit: More updates to postinstall for handling logic flow
More updates to postinstall for handling logic flow Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9edf9d71 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9edf9d71 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9edf9d71 Branch: refs/heads/master Commit: 9edf9d714eb92243efbaa0830915183674638f42 Parents: faa8619 Author: peryderAuthored: Tue Nov 15 11:16:09 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new | 57 +--- 1 file changed, 51 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9edf9d71/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new index d1d497b..abd2170 100755 --- a/traffic_ops/install/bin/postinstall-new +++ b/traffic_ops/install/bin/postinstall-new @@ -45,6 +45,11 @@ sub getField { my $config_answer = shift; my $fileName = shift; +# if there is no config file and interactive mode prompt for all questions with default answers +if ( $::inputFile eq "" && $::interactive ) { +return promptUser( $question, $config_answer ); +} + # if answer provided in config file use it if ($config_answer) { return $config_answer; @@ -57,7 +62,7 @@ sub getField { # if no answer given in input file attempt to use default answer foreach my $var ( @{ $::defaultInputs->{$fileName} } ) { -if ( defined $var->{$question} ) { +if ( defined $var->{$question} && $var->{$question} ne "" ) { return $var->{$question}; } } @@ -91,6 +96,7 @@ sub getConfig { foreach my $var ( @{ $userInput->{$fileName} } ) { my $question = ( ( keys $var )[0] eq "config_var" ? ( keys $var )[1] : ( keys $var )[0] ); + my $answer = $config{ $var->{"config_var"} } = getField( $question, $var->{$question}, $fileName ); $config{ $var->{"config_var"} } = $answer; @@ -221,6 +227,21 @@ sub generateProfilesDir { my $userIn = $userInput->{$fileName}; } +sub sanityCheckDefaults { +foreach my $file ( ( keys $::defaultInputs ) ) { +foreach my $defaultValue ( @{ $::defaultInputs->{$file} } ) { +my $question = ( ( keys $defaultValue )[0] eq "config_var" ? ( keys $defaultValue )[1] : ( keys $defaultValue )[0] ); +if ( !defined $defaultValue->{$question} || $defaultValue->{$question} eq "" ) { +errorOut("Error: question \'$question\' in file \'$file\' has no default answer\n"); +} + +if ( !defined $defaultValue->{"config_var"} || $defaultValue->{"config_var"} eq "" ) { +errorOut("Error: question \'$question\' in file \'$file\' has no config_var"); +} +} +} +} + # userInput: The entire input config file which is either user input or the defaults # # Checks the input config file against the default inputs. If there is a question located in the default inputs which @@ -248,8 +269,26 @@ sub sanityCheckConfig { } } +# if the question is not found in the config file add it from defaults if ( !$found ) { print "Warning: Value " . Dumper($defaultValue) . "found in defaults but not in \'$file\'\n"; + +my $question = ( ( keys $defaultValue )[0] eq "config_var" ? ( keys $defaultValue )[1] : ( keys $defaultValue )[0] ); + +my %temp; + +# if interactive add the question without default answer +if ($::interactive) { +%temp = ( "config_var" => $defaultValue->{"config_var"}, $question => "" ); +} + +# if not interactive add question with default answer +else { +%temp = ( "config_var" => $defaultValue->{"config_var"}, $question => $defaultValue->{$question} ); +} + +push $userInput->{$file}, \%temp; + $diffs++; } } @@ -364,13 +403,14 @@ sub getDefaults { # if no answer in default die sub main { -my $inputFile = ""; -my $help = 0; +our $inputFile = ""; +my $help = 0; our $interactive = 0; our $debug = 0; GetOptions( "cfile=s" => \$inputFile, +"c=s" => \$inputFile, "i" => \$interactive, "d" => \$debug, "h" => \$help, @@
[05/36] incubator-trafficcontrol git commit: Changed params to cpan to match open source
Changed params to cpan to match open source Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/62da24d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/62da24d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/62da24d6 Branch: refs/heads/master Commit: 62da24d6f420b156bf79e27eb55aacf3b1516cf0 Parents: 7ba725b Author: peryderAuthored: Wed Dec 7 11:55:50 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/lib/BuildPerlDeps.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/62da24d6/traffic_ops/install/lib/BuildPerlDeps.pm -- diff --git a/traffic_ops/install/lib/BuildPerlDeps.pm b/traffic_ops/install/lib/BuildPerlDeps.pm index e127d07..5566b73 100644 --- a/traffic_ops/install/lib/BuildPerlDeps.pm +++ b/traffic_ops/install/lib/BuildPerlDeps.pm @@ -62,18 +62,18 @@ EOF } logger( "Building perl modules", "info" ); -$result = execCommand( "/opt/traffic_ops/install/bin/cpan.sh", "pi_custom_log=" . $::cpanLogFile, "/opt/traffic_ops/install/bin/yaml.txt" ); +$result = execCommand( "/usr/bin/cpan", "pi_custom_log=" . $::cpanLogFile, "-if", "YAML" ); if ( $result != 0 ) { errorOut("Failed to install YAML, look through the output and correct the problem"); } -$result = execCommand( "/opt/traffic_ops/install/bin/cpan.sh", "pi_custom_log=" . $::cpanLogFile, "/opt/traffic_ops/install/bin/carton.txt" ); +$result = execCommand( "/usr/bin/cpan", "pi_custom_log=" . $::cpanLogFile, "-if", "MIYAGAWA/Carton-v1.0.15.tar.gz" ); if ( $result != 0 ) { errorOut("Failed to install Carton, look through the output and correct the problem"); } } -$result = execCommand( "/usr/local/bin/carton", "install", "--deployment", "--cached" ); +$result = execCommand( "/usr/local/bin/carton", "install" ); if ( $result != 0 ) { errorOut("Failure to build required perl modules, check the output and correct the problem"); }
[08/36] incubator-trafficcontrol git commit: Reverted changes not relevant to new postinstall
Reverted changes not relevant to new postinstall Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/034a587a Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/034a587a Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/034a587a Branch: refs/heads/master Commit: 034a587a49127c946d2c4a35fb193fdadaf2786e Parents: c0545f7 Author: peryderAuthored: Wed Nov 9 17:10:00 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/build_trafficops_perl_library | 9 - traffic_ops/install/lib/InstallUtils.pm | 9 - 2 files changed, 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/034a587a/traffic_ops/install/bin/build_trafficops_perl_library -- diff --git a/traffic_ops/install/bin/build_trafficops_perl_library b/traffic_ops/install/bin/build_trafficops_perl_library index 33eda0c..aa3809d 100755 --- a/traffic_ops/install/bin/build_trafficops_perl_library +++ b/traffic_ops/install/bin/build_trafficops_perl_library @@ -1,7 +1,5 @@ #!/usr/bin/perl # -# Copyright 2015 Comcast Cable Communications Management, LLC -# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -26,9 +24,6 @@ use InstallUtils; our ($opt_i); -my $auto = $ARGV[0]; -print $auto; - my @dependencies = ( "expat-devel", "mod_ssl", "mkisofs", "libpcap", "libpcap-devel", "libcurl", "libcurl-devel", "mysql-server", "mysql-devel", "openssl", "cpan", "gcc", @@ -72,10 +67,6 @@ if ( $ENV{USER} ne "root" ) { print $msg; -if ( !$auto ) { - InstallUtils::promptUser( "Hit ENTER to continue", "" ); -} - chdir("/opt/traffic_ops/app"); if ( defined $opt_i && $opt_i == 1 ) { http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/034a587a/traffic_ops/install/lib/InstallUtils.pm -- diff --git a/traffic_ops/install/lib/InstallUtils.pm b/traffic_ops/install/lib/InstallUtils.pm index ddd1c22..4d45e7d 100644 --- a/traffic_ops/install/lib/InstallUtils.pm +++ b/traffic_ops/install/lib/InstallUtils.pm @@ -64,10 +64,6 @@ sub promptUser { } return $response; } - elsif ( $::auto && defined $defaultValue ) { - print( "$defaultValue\n" ); - return $defaultValue; - } else { $| = 1; $_ = ; @@ -100,11 +96,6 @@ sub promptPassword { sub promptPasswordVerify { my $prompt = shift; my $pw = shift; - - if ( $::auto && defined $pw ) { - print( "$prompt: $pw\n" ); - return $pw; - } while (1) { $pw = promptPassword($prompt);
[17/36] incubator-trafficcontrol git commit: Fixed dependencies not being downloaded by adding -y to yum install
Fixed dependencies not being downloaded by adding -y to yum 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/e6a31225 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e6a31225 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e6a31225 Branch: refs/heads/master Commit: e6a3122520af7bfe353ea6917f296375b5d7a009 Parents: 0ab8be7 Author: peryderAuthored: Mon Dec 5 14:13:13 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new-integrated | 3 +-- traffic_ops/install/lib/BuildPerlDeps.pm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e6a31225/traffic_ops/install/bin/postinstall-new-integrated -- diff --git a/traffic_ops/install/bin/postinstall-new-integrated b/traffic_ops/install/bin/postinstall-new-integrated index 3bfb712..dbf0791 100755 --- a/traffic_ops/install/bin/postinstall-new-integrated +++ b/traffic_ops/install/bin/postinstall-new-integrated @@ -18,7 +18,6 @@ use ProfileCleanup qw { :all }; use Digest::SHA1 qw(sha1_hex); use Data::Dumper qw(Dumper); use Scalar::Util qw(looks_like_number); - use Getopt::Long; # paths of the output configuration files @@ -50,7 +49,7 @@ my $dumpDefaults; # log file for the installer our $logFile = "/var/log/traffic_ops/postinstall.log"; -# maximum size the log file should be before rotating it - rotating it copies the current log +# maximum size the uncompressed log file should be before rotating it - rotating it copies the current log # file to the same name appended with .bkp replacing the old backup if any is there my $maxLogSize = 100;#bytes http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e6a31225/traffic_ops/install/lib/BuildPerlDeps.pm -- diff --git a/traffic_ops/install/lib/BuildPerlDeps.pm b/traffic_ops/install/lib/BuildPerlDeps.pm index b3126bc..e127d07 100644 --- a/traffic_ops/install/lib/BuildPerlDeps.pm +++ b/traffic_ops/install/lib/BuildPerlDeps.pm @@ -56,7 +56,7 @@ EOF } logger( "Installing dependencies", "info" ); -$result = execCommand( "/usr/bin/yum", "install", @dependencies ); +$result = execCommand( "/usr/bin/yum", "-y", "install", @dependencies ); if ( $result != 0 ) { errorOut("Dependency installation failed, look through the output and correct the problem"); }
[14/36] incubator-trafficcontrol git commit: Updated to include full new postinstall with new perl modules
Updated to include full new postinstall with new perl modules Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bae43757 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bae43757 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bae43757 Branch: refs/heads/master Commit: bae4375757ceb18358c4bd2dcf5ce873ec225e02 Parents: 4a2657b Author: peryderAuthored: Thu Dec 1 17:05:28 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/input.json | 138 +++- traffic_ops/install/bin/postinstall-new | 15 +- .../install/bin/postinstall-new-integrated | 763 +++ traffic_ops/install/lib/BuildPerlDeps.pm| 99 +++ traffic_ops/install/lib/GenerateCert.pm | 232 ++ traffic_ops/install/lib/InstallUtils.pm | 268 --- traffic_ops/install/lib/ProfileCleanup.pm | 192 + 7 files changed, 1580 insertions(+), 127 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bae43757/traffic_ops/install/bin/input.json -- diff --git a/traffic_ops/install/bin/input.json b/traffic_ops/install/bin/input.json index 8428eec..fd9f0e6 100644 --- a/traffic_ops/install/bin/input.json +++ b/traffic_ops/install/bin/input.json @@ -1,11 +1,11 @@ { - "testdb.conf": [ + "/opt/traffic_ops/app/conf/production/database.conf": [ { "Database type": "mysql", "config_var": "type" }, { - "Database name": "traffic_ops", + "Database name": "traffic_ops_db", "config_var": "dbname" }, { @@ -16,26 +16,28 @@ "Database port number": "3306", "config_var": "port" }, -{ -"Root database user": "root", -"config_var": "root_user" -}, -{ -"Root database password": "default", -"config_var": "root_passwd" -} + { + "Traffic Ops database user": "traffic_ops", + "config_var": "user" + }, + { + "Traffic Ops database password": "default", + "config_var": "password", +"hidden": "1" + } ], - "testtodb.conf": [ -{ -"Traffic Ops database user": "root", -"config_var": "dbAdminUser" -}, + "/opt/traffic_ops/app/db/dbconf.yml": [ + { + "Database server root (admin) username": "root", + "config_var": "dbAdminUser" + }, { -"Password for Traffic Ops database user": "default", -"config_var": "dbAdminPw" -} + "Database server admin password": "default", + "config_var": "dbAdminPw", +"hidden": "1" + } ], - "testcdn.conf": [ + "/opt/traffic_ops/app/conf/cdn.conf": [ { "Generate a new secret?": "yes", "config_var": "genSecret" @@ -45,7 +47,7 @@ "config_var": "keepSecrets" } ], - "testldap.conf": [ + "/opt/traffic_ops/app/conf/ldap.conf": [ { "Do you want to set up LDAP?": "no", "config_var": "setupLdap" @@ -60,23 +62,101 @@ }, { "LDAP Admin Password": "", - "config_var": "password" + "config_var": "password", +"hidden": "1" }, { "LDAP Search Base": "", "config_var": "search_base" } ], - "testpost_install.json": [], - "testusers.json": [ + "/opt/traffic_ops/install/data/json/users.json": [ +{ +"Administration username for Traffic Ops": "root", +"config_var": "tmAdminUser" +}, +{ +"Password for the admin user": "default", +
[01/36] incubator-trafficcontrol git commit: Misc fixes for maxmind location in config and generating a cert without input parameters
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 5be5a7c9c -> aac8a858c Misc fixes for maxmind location in config and generating a cert without input parameters Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/aac8a858 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/aac8a858 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/aac8a858 Branch: refs/heads/master Commit: aac8a858c3de4129bef5e34da5cf3f065f8fb19c Parents: f1f9af0 Author: peter.w.ryderAuthored: Fri Jan 27 11:41:47 2017 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/input.json | 12 ++-- traffic_ops/install/bin/postinstall | 15 +-- traffic_ops/install/lib/GenerateCert.pm | 23 +-- 3 files changed, 32 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/aac8a858/traffic_ops/install/bin/input.json -- diff --git a/traffic_ops/install/bin/input.json b/traffic_ops/install/bin/input.json index 136dfa7..85c4d03 100644 --- a/traffic_ops/install/bin/input.json +++ b/traffic_ops/install/bin/input.json @@ -24,10 +24,6 @@ "Traffic Ops database password":"default", "config_var":"password", "hidden":"1" -}, -{ - "Download Maxmind Database?":"yes", - "config_var":"maxmind" } ], "/opt/traffic_ops/app/db/dbconf.yml":[ @@ -39,6 +35,10 @@ "Database server admin password":"default", "config_var":"dbAdminPw", "hidden":"1" +}, +{ + "Download Maxmind Database?":"yes", + "config_var":"maxmind" } ], "/opt/traffic_ops/app/conf/cdn.conf":[ @@ -164,7 +164,7 @@ "config_var":"health_thresh_load_avg" }, { - "Health Threshold Available Bandwidth in Kbps":">175", + "Health Threshold Available Bandwidth in Kbps":"175", "config_var":"health_thresh_kbps" }, { @@ -172,4 +172,4 @@ "config_var":"health_connect_timeout" } ] -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/aac8a858/traffic_ops/install/bin/postinstall -- diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall index fbff253..97f5028 100755 --- a/traffic_ops/install/bin/postinstall +++ b/traffic_ops/install/bin/postinstall @@ -407,11 +407,8 @@ sub getDefaults { "Password for Traffic Ops database user" => "", "config_var" => "password", "hidden" => "true" -}, -{ -"Download Maxmind Database?" => "yes", -"config_var" => "maxmind" } + ], $dbConfFile => [ { @@ -422,6 +419,10 @@ sub getDefaults { "Password for database server admin" => "", "config_var" => "dbAdminPw", "hidden" => "true" +}, +{ +"Download Maxmind Database?" => "yes", +"config_var" => "maxmind" } ], $cdnConfFile => [ @@ -754,7 +755,9 @@ sub main { my $opensslconf = generateOpenSSLConf( $userInput, $opensslConfFile ); my $paramconf = generateParamConf( $userInput, $paramConfFile ); -InstallUtils::writeJson( $post_install_cfg, $paramconf ); +if ( !-f $post_install_cfg ) { +InstallUtils::writeJson( $post_install_cfg, {} ); +} # if reconfigure is set then setup the database if ($reconfigure) { @@ -762,7 +765,7 @@ sub main { setupDatabase( $todbconf, $opensslConfFile, $opensslconf->{"genCert"}, $todbconf->{"maxmind"} ); } else { -setupDatabase( $todbconf, 0, $opensslconf->{"genCert"} ); +setupDatabase( $todbconf, 0, $opensslconf->{"genCert"}, $todbconf->{"maxmind"} ); } } http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/aac8a858/traffic_ops/install/lib/GenerateCert.pm -- diff --git a/traffic_ops/install/lib/GenerateCert.pm b/traffic_ops/install/lib/GenerateCert.pm index ef2bb46..644e482 100644 --- a/traffic_ops/install/lib/GenerateCert.pm +++ b/traffic_ops/install/lib/GenerateCert.pm @@ -142,18 +142,21 @@ sub createCert { }
[32/36] incubator-trafficcontrol git commit: Fixed input.json
Fixed input.json Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d775c033 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d775c033 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d775c033 Branch: refs/heads/master Commit: d775c033b303390b3ef469d382182fd84128e482 Parents: 64f49e3 Author: peryderAuthored: Mon Jan 9 09:27:01 2017 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/input.json | 101 +++- 1 file changed, 99 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d775c033/traffic_ops/install/bin/input.json -- diff --git a/traffic_ops/install/bin/input.json b/traffic_ops/install/bin/input.json index b1adce2..31b126f 100644 --- a/traffic_ops/install/bin/input.json +++ b/traffic_ops/install/bin/input.json @@ -67,5 +67,102 @@ }, { "LDAP Search Base":"", - "input.json" 169 L, - 4044 C \ No newline at end of file + "config_var":"search_base" +} + ], + "/opt/traffic_ops/install/data/json/users.json":[ +{ + "Administration username for Traffic Ops":"root", + "config_var":"tmAdminUser" +}, +{ + "Password for the admin user":"default", + "config_var":"tmAdminPw", + "hidden":"1" +} + ], + "/opt/traffic_ops/install/data/profiles/":[ + + ], + "/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", + "config_var":"country" +}, +{ + "State or Province Name (full name)":"Default State", + "config_var":"state" +}, +{ + "Locality Name (eg, city)":"Default City", + "config_var":"locality" +}, +{ + "Organization Name (eg, company)":"Default Company Ltd", + "config_var":"company" +}, +{ + "Organizational Unit Name (eg, section)":"", + "config_var":"org_unit" +}, +{ + "Common Name (eg, your name or your server's hostname)":"example.com", + "config_var":"common_name" +}, +{ + "RSA Passphrase":"password", + "config_var":"rsaPassword", + "hidden":"1" +} + ], + "/opt/traffic_ops/install/data/json/profiles.json":[ +{ + "Traffic Ops url":"https://localhost;, + "config_var":"tm.url" +}, +{ + "Human-readable CDN Name. (No whitespace, please)":"kabletown_cdn", + "config_var":"cdn_name" +}, +{ + "Health Polling Interval (milliseconds)":"8000", + "config_var":"health_polling_int" +}, +{ + "DNS sub-domain for which your CDN is authoritative":"cdn1.kabletown.net", + "config_var":"dns_subdomain" +}, +{ + "TLD SOA admin":"traffic_ops", + "config_var":"soa_admin" +}, +{ + "TrafficServer Drive Prefix":"/dev/sd", + "config_var":"driver_prefix" +}, +{ + "TrafficServer RAM Drive Prefix":"/dev/ram", + "config_var":"ram_drive_prefix" +}, +{ + "TrafficServer RAM Drive Letters (comma separated)":"0,1,2,3,4,5,6,7", + "config_var":"ram_drive_letters" +}, +{ + "Health Threshold Load Average":"25", + "config_var":"health_thresh_load_avg" +}, +{ + "Health Threshold Available Bandwidth in Kbps":">175", + "config_var":"health_thresh_kbps" +}, +{ + "Traffic Server Health Connection Timeout (milliseconds)":"2000", + "config_var":"health_connect_timeout" +} + ] +} \ No newline at end of file
[03/36] incubator-trafficcontrol git commit: -Removed reconfigure line -Removed trailing spaces in input.json -Renamed postinstall-new to postinstall for easier diff
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/64f49e3f/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new deleted file mode 100755 index 1092338..000 --- a/traffic_ops/install/bin/postinstall-new +++ /dev/null @@ -1,781 +0,0 @@ -#!/usr/bin/perl - -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# 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); -$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; - -use Safe; -use POSIX; -use File::Basename qw{dirname}; -use File::Path qw{make_path}; -use InstallUtils qw{ :all }; -use BuildPerlDeps qw{ :all }; -use GenerateCert qw{ :all }; -use ProfileCleanup qw { :all }; -use Digest::SHA1 qw(sha1_hex); -use Data::Dumper qw(Dumper); -use Scalar::Util qw(looks_like_number); -use Getopt::Long; - -# paths of the output configuration files -our $databaseConfFile = "/opt/traffic_ops/app/conf/production/database.conf"; -our $dbConfFile = "/opt/traffic_ops/app/db/dbconf.yml"; -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/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; - -# old way of reconfiguring postinstall - only here to check for file and let user know it is deprecated -my $reconfigure_file = "/opt/traffic_ops/.reconfigure"; - -# whether or not to reconfigure traffic ops -my $reconfigure; - -# whether to create a config file with default values -my $dumpDefaults; - -# log file for the installer -our $logFile = "/var/log/traffic_ops/postinstall.log"; - -# maximum size the uncompressed log file should be before rotating it - rotating it copies the current log -# file to the same name appended with .bkp replacing the old backup if any is there -my $maxLogSize = 100;#bytes - -# log file for cpan - this log becomes large and is rotated every install -our $cpanLogFile = "/var/log/traffic_ops/cpan.log"; - -# configuration file output with answers which can be used as input to postinstall -our $outputConfigFile = "/var/log/traffic_ops/configuration_file.json"; - -sub getDbDriver { -return "mymysql"; -} - -sub getInstallPath { -my $relPath = shift; -return join( '/', "/tmp/traffic_ops", $relPath ); -} - -# given a var to the hash of config_var and question, will return the question -sub getConfigQuestion { -my $var = shift; -foreach my $key ( keys $var ) { -if ( $key ne "hidden" && $key ne "config_var" ) { -return $key; -} -} -} - -# question: The question given in the config file -# config_answer: The answer given in the config file - if no config file given will be defaultInput -# hidden: Whether or not the answer should be hidden from the terminal and logs, ex. passwords -# -# Determines if the script is being run in complete interactive mode and prompts user - otherwise -# returns answer to question in config or defaults - -sub getField { -my $question = shift; -my $config_answer = shift; -my $hidden= shift; - -# if there is no config file and not in automatic mode prompt for all questions with default answers -if ( !$::inputFile && !$::automatic ) { - -# if hidden then dont show password in terminal -if ($hidden) { -return promptPasswordVerify($question); -} -else { -return promptUser( $question, $config_answer ); -} -} - -return $config_answer; -} - -# userInput: The entire input config file which is either user input or the defaults -# fileName: The name of the output
[07/36] incubator-trafficcontrol git commit: Work in progress of automating postinstall
Work in progress of automating postinstall Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c0545f7d Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c0545f7d Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c0545f7d Branch: refs/heads/master Commit: c0545f7d2690aed814fd1f9f1cb57e3f5db7b116 Parents: 5be5a7c Author: peryderAuthored: Wed Nov 9 17:05:21 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- .../install/bin/build_trafficops_perl_library | 44 +- traffic_ops/install/bin/input.json | 82 traffic_ops/install/bin/postinstall-new | 419 +++ traffic_ops/install/lib/InstallUtils.pm | 42 +- 4 files changed, 553 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c0545f7d/traffic_ops/install/bin/build_trafficops_perl_library -- diff --git a/traffic_ops/install/bin/build_trafficops_perl_library b/traffic_ops/install/bin/build_trafficops_perl_library index 684916d..33eda0c 100755 --- a/traffic_ops/install/bin/build_trafficops_perl_library +++ b/traffic_ops/install/bin/build_trafficops_perl_library @@ -1,5 +1,6 @@ #!/usr/bin/perl # +# Copyright 2015 Comcast Cable Communications Management, LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +15,10 @@ # 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); +$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; use Getopt::Std; @@ -21,6 +26,9 @@ use InstallUtils; our ($opt_i); +my $auto = $ARGV[0]; +print $auto; + my @dependencies = ( "expat-devel", "mod_ssl", "mkisofs", "libpcap", "libpcap-devel", "libcurl", "libcurl-devel", "mysql-server", "mysql-devel", "openssl", "cpan", "gcc", @@ -34,38 +42,6 @@ compiler will be installed on this machine. EOF -sub promptUser { - my ( $promptString, $defaultValue, $noEcho ) = @_; - - if ($defaultValue) { - print $promptString, " [", $defaultValue, "]: "; - } - else { - print $promptString, ": "; - } - - if ( defined $noEcho && $noEcho ) { - my $response = read_password(''); - if ( ( !defined $response || $response eq '' ) && ( defined $defaultValue && $defaultValue ne '' ) ) { - $response = $defaultValue; - } - return $response; - } - else { - $| = 1; - $_ = ; - chomp; - - if ("$defaultValue") { - return $_ ? $_ : $defaultValue; - } - else { - return $_; - } - return $_; - } -} - sub trim { my $str = shift; @@ -96,7 +72,9 @@ if ( $ENV{USER} ne "root" ) { print $msg; -promptUser( "Hit ENTER to continue", "" ); +if ( !$auto ) { + InstallUtils::promptUser( "Hit ENTER to continue", "" ); +} chdir("/opt/traffic_ops/app"); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c0545f7d/traffic_ops/install/bin/input.json -- diff --git a/traffic_ops/install/bin/input.json b/traffic_ops/install/bin/input.json new file mode 100644 index 000..8428eec --- /dev/null +++ b/traffic_ops/install/bin/input.json @@ -0,0 +1,82 @@ +{ + "testdb.conf": [ + { + "Database type": "mysql", + "config_var": "type" + }, + { + "Database name": "traffic_ops", + "config_var": "dbname" + }, + { + "Database server hostname IP or FQDN": "localhost", + "config_var": "hostname" + }, + { + "Database port number": "3306", + "config_var": "port" + }, +{ +"Root database user": "root", +"config_var": "root_user" +}, +{ +"Root database
[21/36] incubator-trafficcontrol git commit: Formatted input.json
Formatted input.json Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ca4b10ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ca4b10ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ca4b10ae Branch: refs/heads/master Commit: ca4b10ae8274258aee3c53188038762929d1b4f4 Parents: 832a50f Author: peryderAuthored: Wed Dec 7 10:11:17 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/input.json | 326 1 file changed, 164 insertions(+), 162 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ca4b10ae/traffic_ops/install/bin/input.json -- diff --git a/traffic_ops/install/bin/input.json b/traffic_ops/install/bin/input.json index 40430e9..9978acb 100644 --- a/traffic_ops/install/bin/input.json +++ b/traffic_ops/install/bin/input.json @@ -1,162 +1,164 @@ -{ - "/opt/traffic_ops/app/conf/production/database.conf": [ -{ -"Database type": "mysql", -"config_var": "type" -}, - { - "Database name": "traffic_ops_db", - "config_var": "dbname" - }, - { - "Database server hostname IP or FQDN": "localhost", - "config_var": "hostname" - }, - { - "Database port number": "3306", - "config_var": "port" - }, - { - "Traffic Ops database user": "traffic_ops", - "config_var": "user" - }, - { - "Traffic Ops database password": "default", - "config_var": "password", -"hidden": "1" - } - ], - "/opt/traffic_ops/app/db/dbconf.yml": [ - { - "Database server root (admin) username": "root", - "config_var": "dbAdminUser" - }, -{ - "Database server admin password": "default", - "config_var": "dbAdminPw", -"hidden": "1" - } - ], - "/opt/traffic_ops/app/conf/cdn.conf": [ - { - "Generate a new secret?": "yes", - "config_var": "genSecret" - }, - { - "Number of secrets to keep?": "10", - "config_var": "keepSecrets" - } - ], - "/opt/traffic_ops/app/conf/ldap.conf": [ - { - "Do you want to set up LDAP?": "no", - "config_var": "setupLdap" - }, - { - "LDAP server hostname": "", - "config_var": "hostname" - }, - { - "LDAP Admin DN": "", - "config_var": "admin_dn" - }, - { - "LDAP Admin Password": "", - "config_var": "password", -"hidden": "1" - }, - { - "LDAP Search Base": "", - "config_var": "search_base" - } - ], - "/opt/traffic_ops/install/data/json/users.json": [ -{ -"Administration username for Traffic Ops": "root", -"config_var": "tmAdminUser" -}, -{ -"Password for the admin user": "default", -"config_var": "tmAdminPw", -"hidden": "1" -} - ], - "/opt/traffic_ops/install/data/profiles/": [], - "/opt/traffic_ops/install/bin/openssl_configuration.json": [ - { - "Country Name (2 letter code)": "XX", - "config_var": "country" - }, - { - "State or Province Name (full name)": "Default State", - "config_var": "state" - }, - { - "Locality Name (eg, city)": "Default City", - "config_var": "locality" - }, - { - "Organization Name (eg, company)": "Default Company Ltd", -
[11/36] incubator-trafficcontrol git commit: Formatting changes
Formatting changes Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/faa86192 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/faa86192 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/faa86192 Branch: refs/heads/master Commit: faa86192b1bcf611e33f65ced805e0d34d5e62c0 Parents: ce47eb8 Author: peryderAuthored: Mon Nov 14 15:47:00 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new | 609 ++- 1 file changed, 306 insertions(+), 303 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/faa86192/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new index 6d3ca0f..d1d497b 100755 --- a/traffic_ops/install/bin/postinstall-new +++ b/traffic_ops/install/bin/postinstall-new @@ -19,54 +19,54 @@ use Scalar::Util qw(looks_like_number); use Getopt::Long; sub errorOut { - die @_; +die @_; } sub getDbDriver { - return "mymysql"; +return "mymysql"; } sub getInstallPath { - my $relPath = shift; - return join( '/', "/tmp/traffic_ops", $relPath ); +my $relPath = shift; +return join( '/', "/tmp/traffic_ops", $relPath ); } # question: The question given in the config file # config_answer: The answer given in the config file - if no config file given will be defaultInput # fileName: The name of the output config file given by the input config file # -# Determines an answer to the questions asked. If an input question and answer pair is given, will return the +# Determines an answer to the questions asked. If an input question and answer pair is given, will return the # answer. If a question is given but no answer, it will prompt the user if interactive mode is enabled, but if # interactive mode is not enabled it will return the default answer to the question. If there is no default answer # to the question and interactive mode is not enabled it will return an error and quit. sub getField { - my $question = shift; - my $config_answer = shift; - my $fileName = shift; - - # if answer provided in config file use it - if ($config_answer) { - return $config_answer; - } - else { - # if no config value and in interactive mode prompt user -if ($::interactive) { -return promptUser($question); - } - - # if no answer given in input file attempt to use default answer - foreach my $var (@{ $::defaultInputs->{$fileName} }) { - if ( defined $var->{$question} ) { - return $var->{$question}; - } - } - - #No way of getting answer - errorOut("No config answer given for question \'$question\'\n"); - } - - errorOut("error: end of function"); +my $question = shift; +my $config_answer = shift; +my $fileName = shift; + +# if answer provided in config file use it +if ($config_answer) { +return $config_answer; +} +else { +# if no config value and in interactive mode prompt user +if ($::interactive) { +return promptUser($question); +} + +# if no answer given in input file attempt to use default answer +foreach my $var ( @{ $::defaultInputs->{$fileName} } ) { +if ( defined $var->{$question} ) { +return $var->{$question}; +} +} + +#No way of getting answer +errorOut("No config answer given for question \'$question\'\n"); +} + +errorOut("error: end of function"); } # userInput: The entire input config file which is either user input or the defaults @@ -76,29 +76,29 @@ sub getField { # and returns the hash of answers sub getConfig { - my $userInput = shift; - my $fileName = shift; - - my %config; - - if (!defined $userInput->{$fileName}) { - print "Error: No $fileName found in config\n"; - } - - if ($::debug) { - print "===$fileName===\n"; - } - - foreach my $var (@{ $userInput->{$fileName} }) { - my $question = ( (keys $var)[0] eq "config_var" ? (keys $var)[1] : (keys $var)[0] ); - my $answer = $config{$var->{"config_var"}} = getField($question,
[34/36] incubator-trafficcontrol git commit: Removed global vars and made many minor improvements
Removed global vars and made many minor improvements Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/230aa7c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/230aa7c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/230aa7c0 Branch: refs/heads/master Commit: 230aa7c0735312d0a35c1f76f8ca5f1991640368 Parents: d775c03 Author: peter.w.ryderAuthored: Thu Jan 12 15:10:00 2017 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall | 293 +++-- traffic_ops/install/lib/BuildPerlDeps.pm | 32 ++- traffic_ops/install/lib/GenerateCert.pm | 26 +- traffic_ops/install/lib/InstallUtils.pm | 21 +- traffic_ops/install/lib/ProfileCleanup.pm | 199 +-- traffic_ops/install/lib/WebDep.pm | 337 + 6 files changed, 493 insertions(+), 415 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/230aa7c0/traffic_ops/install/bin/postinstall -- diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall index 1092338..2f6f3d7 100755 --- a/traffic_ops/install/bin/postinstall +++ b/traffic_ops/install/bin/postinstall @@ -25,53 +25,66 @@ use Safe; use POSIX; use File::Basename qw{dirname}; use File::Path qw{make_path}; -use InstallUtils qw{ :all }; -use BuildPerlDeps qw{ :all }; -use GenerateCert qw{ :all }; -use ProfileCleanup qw { :all }; use Digest::SHA1 qw(sha1_hex); use Data::Dumper qw(Dumper); use Scalar::Util qw(looks_like_number); use Getopt::Long; +use InstallUtils; +use BuildPerlDeps; +use GenerateCert qw{ :all }; +use ProfileCleanup; + # paths of the output configuration files -our $databaseConfFile = "/opt/traffic_ops/app/conf/production/database.conf"; -our $dbConfFile = "/opt/traffic_ops/app/db/dbconf.yml"; -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/data/json/openssl_configuration.json"; -our $paramConfFile= "/opt/traffic_ops/install/data/json/profiles.json"; +my $databaseConfFile = "/opt/traffic_ops/app/conf/production/database.conf"; +my $dbConfFile = "/opt/traffic_ops/app/db/dbconf.yml"; +my $cdnConfFile = "/opt/traffic_ops/app/conf/cdn.conf"; +my $ldapConfFile = "/opt/traffic_ops/app/conf/ldap.conf"; +my $usersConfFile= "/opt/traffic_ops/install/data/json/users.json"; +my $profilesConfFile = "/opt/traffic_ops/install/data/profiles/"; +my $opensslConfFile = "/opt/traffic_ops/install/data/json/openssl_configuration.json"; +my $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"; +my $custom_profile_dir = $profilesConfFile . "custom"; -our $reconfigure_defaults = "/opt/traffic_ops/.reconfigure_defaults"; +# stores parameters for traffic ops config +my $parameters; -our $parameters; +# location of traffic ops profiles +my $profileDir = "/opt/traffic_ops/install/data/profiles/"; +my $post_install_cfg = "/opt/traffic_ops/install/data/json/post_install.json"; -# old way of reconfiguring postinstall - only here to check for file and let user know it is deprecated -my $reconfigure_file = "/opt/traffic_ops/.reconfigure"; +# log file for the installer +my $logFile = "/var/log/traffic_ops/postinstall.log"; + +# debug mode +my $debug = 0; + +# log file for cpan output +my $cpanLogFile = "/var/log/traffic_ops/cpan.log"; # whether or not to reconfigure traffic ops -my $reconfigure; +my $reconfigure = 0; -# whether to create a config file with default values -my $dumpDefaults; +# used to check for .reconfigure_defaults file for backwards compatability +my $reconfigure_defaults = "/opt/traffic_ops/.reconfigure_defaults"; -# log file for the installer -our $logFile = "/var/log/traffic_ops/postinstall.log"; +# old way of reconfiguring postinstall - only here to check for file and let user know it is deprecated +my $reconfigure_file = "/opt/traffic_ops/.reconfigure"; # maximum size the uncompressed log file should be before rotating it - rotating it copies the current log # file to the same name appended with .bkp replacing the old backup if any is there -my $maxLogSize = 100;#bytes +my $maxLogSize = 1000;#bytes
[26/36] incubator-trafficcontrol git commit: Changed filename to postinstall-new
Changed filename to postinstall-new Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7ba725b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7ba725b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7ba725b1 Branch: refs/heads/master Commit: 7ba725b101e2bc2f4ebfdd183b2c353b7374e077 Parents: 7054561 Author: peryderAuthored: Wed Dec 7 10:59:30 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/bin/postinstall-new | 781 +++ .../install/bin/postinstall-new-integrated | 781 --- 2 files changed, 781 insertions(+), 781 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7ba725b1/traffic_ops/install/bin/postinstall-new -- diff --git a/traffic_ops/install/bin/postinstall-new b/traffic_ops/install/bin/postinstall-new new file mode 100755 index 000..9972daa --- /dev/null +++ b/traffic_ops/install/bin/postinstall-new @@ -0,0 +1,781 @@ +#!/usr/bin/perl + +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# 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); +$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; + +use Safe; +use POSIX; +use File::Basename qw{dirname}; +use File::Path qw{make_path}; +use InstallUtils qw{ :all }; +use BuildPerlDeps qw{ :all }; +use GenerateCert qw{ :all }; +use ProfileCleanup qw { :all }; +use Digest::SHA1 qw(sha1_hex); +use Data::Dumper qw(Dumper); +use Scalar::Util qw(looks_like_number); +use Getopt::Long; + +# paths of the output configuration files +our $databaseConfFile = "/opt/traffic_ops/app/conf/production/database.conf"; +our $dbConfFile = "/opt/traffic_ops/app/db/dbconf.yml"; +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 $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; + +# old way of reconfiguring postinstall - only here to check for file and let user know it is deprecated +my $reconfigure_file = "/opt/traffic_ops/.reconfigure"; + +# whether or not to reconfigure traffic ops +my $reconfigure; + +# whether to create a config file with default values +my $dumpDefaults; + +# log file for the installer +our $logFile = "/var/log/traffic_ops/postinstall.log"; + +# maximum size the uncompressed log file should be before rotating it - rotating it copies the current log +# file to the same name appended with .bkp replacing the old backup if any is there +my $maxLogSize = 100;#bytes + +# log file for cpan - this log becomes large and is rotated every install +our $cpanLogFile = "/var/log/traffic_ops/cpan.log"; + +# configuration file output with answers which can be used as input to postinstall +our $outputConfigFile = "/var/log/traffic_ops/configuration_file.json"; + +sub getDbDriver { +return "mymysql"; +} + +sub getInstallPath { +my $relPath = shift; +return join( '/', "/tmp/traffic_ops", $relPath ); +} + +# given a var to the hash of config_var and question, will return the question +sub getConfigQuestion { +my $var = shift; +foreach my $key ( keys $var ) { +if ( $key ne "hidden" && $key ne "config_var" ) { +return $key; +} +} +} + +# question: The question given in the config file +# config_answer: The answer given in the config file - if
[22/36] incubator-trafficcontrol git commit: Perltidy on all files
Perltidy on all 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/d665814e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d665814e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d665814e Branch: refs/heads/master Commit: d665814e939e482bcb665d076e64d9861c1804f8 Parents: ca4b10a Author: peryderAuthored: Wed Dec 7 10:18:49 2016 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/install/lib/BuildPerlDeps.pm | 5 ++- traffic_ops/install/lib/GenerateCert.pm | 1 - traffic_ops/install/lib/InstallUtils.pm | 50 +- traffic_ops/install/lib/ProfileCleanup.pm | 16 + 4 files changed, 28 insertions(+), 44 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d665814e/traffic_ops/install/lib/BuildPerlDeps.pm -- diff --git a/traffic_ops/install/lib/BuildPerlDeps.pm b/traffic_ops/install/lib/BuildPerlDeps.pm index 7c20845..e127d07 100644 --- a/traffic_ops/install/lib/BuildPerlDeps.pm +++ b/traffic_ops/install/lib/BuildPerlDeps.pm @@ -1,5 +1,4 @@ #!/usr/bin/perl - # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,10 +13,10 @@ # limitations under the License. # -package BuildPerlDeps; - use lib qw(/opt/traffic_ops/install/lib /opt/traffic_ops/lib/perl5 /opt/traffic_ops/app/lib); +package BuildPerlDeps; + use InstallUtils qw{ :all }; use base qw{ Exporter }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d665814e/traffic_ops/install/lib/GenerateCert.pm -- diff --git a/traffic_ops/install/lib/GenerateCert.pm b/traffic_ops/install/lib/GenerateCert.pm index 0d4a458..8fb1a11 100644 --- a/traffic_ops/install/lib/GenerateCert.pm +++ b/traffic_ops/install/lib/GenerateCert.pm @@ -54,7 +54,6 @@ sub writeCdn_conf { $cdnh->{hypnotoad}{listen} = [$listen_str]; } else { - # add the whole hypnotoad config without affecting anything else in the config $cdnh->{hypnotoad} = { listen => [$listen_str], http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d665814e/traffic_ops/install/lib/InstallUtils.pm -- diff --git a/traffic_ops/install/lib/InstallUtils.pm b/traffic_ops/install/lib/InstallUtils.pm index c0ad9b5..a4f0266 100644 --- a/traffic_ops/install/lib/InstallUtils.pm +++ b/traffic_ops/install/lib/InstallUtils.pm @@ -42,42 +42,43 @@ our @EXPORT_OK = qw{ execCommand randomWord promptUser promptRequired promptPass our %EXPORT_TAGS = ( all => \@EXPORT_OK ); sub execCommand { -my ( $command, @args ) = @_; +my ( $command, @args ) = @_; my $pipe = IO::Pipe->new; my $pid; -my $result = 0; +my $result= 0; my $customLog = ""; -# find log file in args and remove if found +# find log file in args and remove if found # if there is a string in the list of args which starts with 'pi_custom_log=' then remove it from the parameters and use # it as the log file for the exec foreach my $var (@args) { -if ( index($var, "pi_custom_log=") != -1 ) { -$customLog = (split(/=/, $var))[1]; -splice(@args, index($var, "pi_custom_log="), 1); -logger("Using custom log '$customLog'", "info"); +if ( index( $var, "pi_custom_log=" ) != -1 ) { +$customLog = ( split( /=/, $var ) )[1]; +splice( @args, index( $var, "pi_custom_log=" ), 1 ); +logger( "Using custom log '$customLog'", "info" ); } } - + # create pipe between child and parent and redirect output from child to parent for logging my $child = open READER, '-|'; defined $child or die "pipe/fork: $!\n"; -if ($child) { #parent +if ($child) {#parent while ( $line = ) { + # log all output from child pipe -if ($customLog ne "") { -logger($line, "info", $customLog); +if ( $customLog ne "" ) { +logger( $line, "info", $customLog ); } else { -logger($line, "info"); +logger( $line, "info" ); } } } -else { #child -# redirect stderr to stdout so parent can read +else { #child + # redirect stderr to stdout so parent can read open STDERR, '>'; -
[04/36] incubator-trafficcontrol git commit: -Removed reconfigure line -Removed trailing spaces in input.json -Renamed postinstall-new to postinstall for easier diff
-Removed reconfigure line -Removed trailing spaces in input.json -Renamed postinstall-new to postinstall for easier diff Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/64f49e3f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/64f49e3f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/64f49e3f Branch: refs/heads/master Commit: 64f49e3f747d6d5d40926a5f4fcec9902fa70140 Parents: ed58286 Author: peryderAuthored: Mon Jan 9 09:24:43 2017 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 09:52:53 2017 -0700 -- traffic_ops/build/traffic_ops.spec |1 - traffic_ops/install/bin/input.json | 142 +-- traffic_ops/install/bin/postinstall | 1385 ++ traffic_ops/install/bin/postinstall-new | 781 --- 4 files changed, 747 insertions(+), 1562 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/64f49e3f/traffic_ops/build/traffic_ops.spec -- diff --git a/traffic_ops/build/traffic_ops.spec b/traffic_ops/build/traffic_ops.spec index 4483aa2..35cc608 100644 --- a/traffic_ops/build/traffic_ops.spec +++ b/traffic_ops/build/traffic_ops.spec @@ -109,7 +109,6 @@ Built: %(date) by %{getenv: USER} # install if [ "$1" = "1" ]; then # see postinstall, the .reconfigure file triggers init(). - #/bin/touch %{PACKAGEDIR}/.reconfigure echo -e "\nRun /opt/traffic_ops/install/bin/postinstall from the root home directory to complete the install.\n" fi http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/64f49e3f/traffic_ops/install/bin/input.json -- diff --git a/traffic_ops/install/bin/input.json b/traffic_ops/install/bin/input.json index 76720f6..b1adce2 100644 --- a/traffic_ops/install/bin/input.json +++ b/traffic_ops/install/bin/input.json @@ -1,169 +1,71 @@ -{ - "/opt/traffic_ops/app/conf/production/database.conf":[ -{ +{ + "/opt/traffic_ops/app/conf/production/database.conf":[ +{ "Database type":"mysql", "config_var":"type" }, -{ +{ "Database name":"traffic_ops_db", "config_var":"dbname" }, -{ +{ "Database server hostname IP or FQDN":"localhost", "config_var":"hostname" }, -{ +{ "Database port number":"3306", "config_var":"port" }, -{ +{ "Traffic Ops database user":"traffic_ops", "config_var":"user" }, -{ +{ "Traffic Ops database password":"default", "config_var":"password", "hidden":"1" } ], - "/opt/traffic_ops/app/db/dbconf.yml":[ -{ + "/opt/traffic_ops/app/db/dbconf.yml":[ +{ "Database server root (admin) username":"root", "config_var":"dbAdminUser" }, -{ +{ "Database server admin password":"default", "config_var":"dbAdminPw", "hidden":"1" } ], - "/opt/traffic_ops/app/conf/cdn.conf":[ -{ + "/opt/traffic_ops/app/conf/cdn.conf":[ +{ "Generate a new secret?":"yes", "config_var":"genSecret" }, -{ +{ "Number of secrets to keep?":"10", "config_var":"keepSecrets" } ], - "/opt/traffic_ops/app/conf/ldap.conf":[ -{ + "/opt/traffic_ops/app/conf/ldap.conf":[ +{ "Do you want to set up LDAP?":"no", "config_var":"setupLdap" }, -{ +{ "LDAP server hostname":"", "config_var":"hostname" }, -{ +{ "LDAP Admin DN":"", "config_var":"admin_dn" }, -{ +{ "LDAP Admin Password":"", "config_var":"password", "hidden":"1" }, -{ +{ "LDAP Search Base":"", - "config_var":"search_base" -} - ], - "/opt/traffic_ops/install/data/json/users.json":[ -{ - "Administration username for Traffic Ops":"root", - "config_var":"tmAdminUser" -}, -{ - "Password for the admin user":"default", - "config_var":"tmAdminPw", - "hidden":"1" -} - ], - "/opt/traffic_ops/install/data/profiles/":[ - - ], - "/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", - "config_var":"country" -}, -{ - "State or Province Name (full name)":"Default State", - "config_var":"state" -}, -{ - "Locality Name (eg, city)":"Default City", - "config_var":"locality"
incubator-trafficcontrol git commit: This closes #126.
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master aac8a858c -> dccfdd837 This closes #126. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dccfdd83 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dccfdd83 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dccfdd83 Branch: refs/heads/master Commit: dccfdd837d112689fe7a8ad631acfa8adbe32e2a Parents: aac8a85 Author: Dan KirkwoodAuthored: Fri Jan 27 09:54:26 2017 -0700 Committer: Dan Kirkwood Committed: Fri Jan 27 09:54:26 2017 -0700 -- --
[2/2] incubator-trafficcontrol git commit: This closes #238
This closes #238 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/43cfb5a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/43cfb5a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/43cfb5a1 Branch: refs/heads/master Commit: 43cfb5a191f8e3191c241446fa9516dfd0c27feb Parents: 68ec6fb Author: Dan KirkwoodAuthored: Fri Jan 27 15:12:58 2017 -0700 Committer: Dan Kirkwood Committed: Fri Jan 27 15:12:58 2017 -0700 -- --
[1/2] incubator-trafficcontrol git commit: update link to point to new github location
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master dccfdd837 -> b2a0443ab update link to point to new github location Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3dcf13b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3dcf13b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3dcf13b1 Branch: refs/heads/master Commit: 3dcf13b13b2954c98d715138878461a500faedbf Parents: dccfdd8 Author: Dave NeumanAuthored: Fri Jan 27 13:37:58 2017 -0700 Committer: Dan Kirkwood Committed: Fri Jan 27 15:09:22 2017 -0700 -- traffic_ops/app/templates/navbar.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3dcf13b1/traffic_ops/app/templates/navbar.html.ep -- diff --git a/traffic_ops/app/templates/navbar.html.ep b/traffic_ops/app/templates/navbar.html.ep index 502dc42..727edb1 100644 --- a/traffic_ops/app/templates/navbar.html.ep +++ b/traffic_ops/app/templates/navbar.html.ep @@ -77,7 +77,7 @@ Help About - https://github.com/Comcast/traffic_control/milestones;>Release Notes + https://github.com/apache/incubator-trafficcontrol/milestones;>Release Notes Logout
[1/2] incubator-trafficcontrol git commit: Fixes crash from requiring module name before function calls
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master b2a0443ab -> 43cfb5a19 Fixes crash from requiring module name before function calls Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/68ec6fb6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/68ec6fb6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/68ec6fb6 Branch: refs/heads/master Commit: 68ec6fb697f9ba4f92fbff0d4bb473dd087bb8e4 Parents: b2a0443 Author: PeterRyderAuthored: Fri Jan 27 14:10:37 2017 -0500 Committer: Dan Kirkwood Committed: Fri Jan 27 15:12:37 2017 -0700 -- traffic_ops/install/bin/postinstall | 16 traffic_ops/install/lib/InstallUtils.pm | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/68ec6fb6/traffic_ops/install/bin/postinstall -- diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall index 97f5028..7e13007 100755 --- a/traffic_ops/install/bin/postinstall +++ b/traffic_ops/install/bin/postinstall @@ -30,10 +30,10 @@ use Data::Dumper qw(Dumper); use Scalar::Util qw(looks_like_number); use Getopt::Long; -use InstallUtils; -use BuildPerlDeps; +use InstallUtils qw{ :all }; +use BuildPerlDeps qw{ :all }; use GenerateCert qw{ :all }; -use ProfileCleanup; +use ProfileCleanup qw{ :all }; # paths of the output configuration files my $databaseConfFile = "/opt/traffic_ops/app/conf/production/database.conf"; @@ -122,10 +122,10 @@ sub getField { # if hidden then dont show password in terminal if ($hidden) { -return promptPasswordVerify($question); +return InstallUtils::promptPasswordVerify($question); } else { -return promptUser( $question, $config_answer ); +return InstallUtils::promptUser( $question, $config_answer ); } } @@ -157,7 +157,7 @@ sub getConfig { $config{ $var->{"config_var"} } = $answer; if ( !$hidden ) { -InstallUtils::logger( "$question: $answer", "info" ); +InstallUtils::logger( "$question: $answer", "info" ); } } return %config; @@ -351,10 +351,10 @@ sub sanityCheckConfig { else { InstallUtils::logger( "Prompting user for answer", "info" ); if ($hidden) { -$answer = promptPasswordVerify($question); +$answer = InstallUtils::promptPasswordVerify($question); } else { -$answer = promptUser( $question, $defaultValue->{$question} ); +$answer = InstallUtils::promptUser( $question, $defaultValue->{$question} ); } } http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/68ec6fb6/traffic_ops/install/lib/InstallUtils.pm -- diff --git a/traffic_ops/install/lib/InstallUtils.pm b/traffic_ops/install/lib/InstallUtils.pm index 7ba24d5..57f2e14 100644 --- a/traffic_ops/install/lib/InstallUtils.pm +++ b/traffic_ops/install/lib/InstallUtils.pm @@ -165,10 +165,10 @@ sub promptUser { my ( $promptString, $defaultValue, $noEcho ) = @_; if ($defaultValue) { -print $promptString, " [", $defaultValue, "]: "; +print $promptString, " [", $defaultValue, "]: "; } else { -print $promptString, ": "; +print $promptString, ": "; } if ( defined $noEcho && $noEcho ) {
svn commit: r17989 - in /dev/incubator/trafficcontrol/1.8.0/RC9: ./ trafficcontrol-incubating-1.8.0.tar.gz trafficcontrol-incubating-1.8.0.tar.gz.asc trafficcontrol-incubating-1.8.0.tar.gz.md5 traffic
Author: dangogh Date: Wed Jan 25 15:49:31 2017 New Revision: 17989 Log: trafficcontrol-incubating-1.8.0-RC9 Added: dev/incubator/trafficcontrol/1.8.0/RC9/ dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz (with props) dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.asc dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.md5 dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.sha1 Added: dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz -- svn:mime-type = application/octet-stream Added: dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.asc == --- dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.asc (added) +++ dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.asc Wed Jan 25 15:49:31 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJYiMejAAoJEMSzPIBFh6jwqRsP/17Bx9PoEuT5ukqv0cnSmnVC +s5GyYRLCoX3VenikrAU5f5pinQrBJKxUwCTo0GoReH59UtJEOw1di/FRikUIiyai +2cv2TDwzOjDQ3oujMB5cCUV1EypU1qD9Zxrdjryd834zaam1RlGY/MiophDxAeof +YrSvzNL6t1b6kB8QmZhgtMzhc+5UcLWSz1i6CrWMUc4K4JhpkGjZuznHqPehF2I7 +9Uq1JbkVVUd2dhH2jvPgRlGcwymcTkVI9vJfj9pZr8w2NfRkQij3pE41/ZqiN2hV +tMMJrzcxrHkvht1AHciCNSQFODdzWd0k3mcPZ69BOSnCuxL1qwzFTy0ZC67nl/nk +ncUF4eHGA9B335DAVs6Hd3UYrQ8OwtI+O6DEhMG4JNwgneWoiMKPdU3tZZk7nWDT +N8aTmD22z4vWlubGWhAvpqDWw+0pu6ra/QPMStKH8oO8MI58eKTZDb/FH65ThYgI +tx8vzJKziBywxBCOjmwjT6itrLw5l6xvB7w/cVXv+D0/tXfelFJx/Gk1pWOsXAyv +f1U4ULBQKTsLd0Sa8u0deSnPf/dr768j98aKqCzzBvkxrD6mYR/Njxiigzum0t9P +8vZyOqKAORYUD9anycLSVWIEU7nGVNWcOLvWLoj3eb+XnhYOZC+JqVM/fyz5rInR +dJjIqW6W8f7uzfdfSv+x +=2VOH +-END PGP SIGNATURE- Added: dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.md5 == --- dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.md5 (added) +++ dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.md5 Wed Jan 25 15:49:31 2017 @@ -0,0 +1 @@ +08fe2fe1575632044863fbd2cc25b801 trafficcontrol-incubating-1.8.0.tar.gz Added: dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.sha1 == --- dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.sha1 (added) +++ dev/incubator/trafficcontrol/1.8.0/RC9/trafficcontrol-incubating-1.8.0.tar.gz.sha1 Wed Jan 25 15:49:31 2017 @@ -0,0 +1 @@ +dd20e5295bdbdc8cf704084432d614631a331d31 trafficcontrol-incubating-1.8.0.tar.gz
[1/2] incubator-trafficcontrol git commit: removes ort routes that appear to have been broken since 10/5/15
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 62c5a5cbf -> 9d9afe158 removes ort routes that appear to have been broken since 10/5/15 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/edf65f44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/edf65f44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/edf65f44 Branch: refs/heads/master Commit: edf65f4424e64379eb0309320d38552071d613f8 Parents: 62c5a5c Author: Jeremy MitchellAuthored: Wed Jan 18 14:09:58 2017 -0700 Committer: Dan Kirkwood Committed: Fri Jan 20 19:46:18 2017 + -- traffic_ops/app/lib/TrafficOpsRoutes.pm | 2 - traffic_ops/app/lib/UI/Ort.pm | 59 2 files changed, 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/edf65f44/traffic_ops/app/lib/TrafficOpsRoutes.pm -- diff --git a/traffic_ops/app/lib/TrafficOpsRoutes.pm b/traffic_ops/app/lib/TrafficOpsRoutes.pm index 8b7de9c..19aebc2 100644 --- a/traffic_ops/app/lib/TrafficOpsRoutes.pm +++ b/traffic_ops/app/lib/TrafficOpsRoutes.pm @@ -240,9 +240,7 @@ sub ui_routes { # -- Ort $r->route('/ort/:hostname/ort1')->via('GET')->over( authenticated => 1 )->to( 'Ort#ort1', namespace => $namespace ); $r->route('/ort/:hostname/packages')->via('GET')->over( authenticated => 1 )->to( 'Ort#get_package_versions', namespace => $namespace ); - $r->route('/ort/:hostname/package/:package')->via('GET')->over( authenticated => 1 )->to( 'Ort#get_package_version', namespace => $namespace ); $r->route('/ort/:hostname/chkconfig')->via('GET')->over( authenticated => 1 )->to( 'Ort#get_chkconfig', namespace => $namespace ); - $r->route('/ort/:hostname/chkconfig/:package')->via('GET')->over( authenticated => 1 )->to( 'Ort#get_package_chkconfig', namespace => $namespace ); # -- Parameter $r->post('/parameter/create')->over( authenticated => 1 )->to( 'Parameter#create', namespace => $namespace ); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/edf65f44/traffic_ops/app/lib/UI/Ort.pm -- diff --git a/traffic_ops/app/lib/UI/Ort.pm b/traffic_ops/app/lib/UI/Ort.pm index a026b0b..3da5cbc 100644 --- a/traffic_ops/app/lib/UI/Ort.pm +++ b/traffic_ops/app/lib/UI/Ort.pm @@ -73,47 +73,6 @@ sub __get_json_parameter_list_by_host { return($data_obj); } -sub __get_json_parameter_by_host { - my $self = shift; - my $host = shift; - my $parameter = shift; - my $value = shift; - my $key_name = shift || "name"; - my $key_value = shift || "value"; - my $data_obj; - - my $rs_profile - = $self->db->resultset('Server')->search( { 'me.host_name' => $host }, - { prefectch => [ 'cdn', 'profile' ] } ); - - my $row = $rs_profile->next; - my $id = $row->id; - if ( defined($row) && defined( $row->cdn->name ) ) { - push( - @{$data_obj}, - { $key_name => "CDN_Name", $key_value => $row->cdn->name } - ); - } - - my %condition = ( - 'profile_parameters.profile' => $id, - 'config_file'=> $value, - name => $parameter - ); - my $rs_config = $self->db->resultset('Parameter') - ->search( \%condition, { join => 'profile_parameters' } ); - $row = $rs_config->next; - - if ( defined($row) && defined( $row->name ) && defined( $row->value ) ) { - push( - @{$data_obj}, - { $key_name => $row->name, $key_value => $row->value } - ); - } - - return ($data_obj); -} - sub get_package_versions { my $self = shift; my $host_name = $self->param("hostname"); @@ -122,15 +81,6 @@ sub get_package_versions { $self->render( json => $data_obj ); } -sub get_package_version { - my $self = shift; - my $host_name = $self->param("hostname"); - my $package = $self->param("package"); - my $data_obj = __get_json_parameter_by_host($self, $host_name, $package, "package", "name", "version"); - - $self->render( json => $data_obj ); -} - sub get_chkconfig { my $self = shift; my $host_name = $self->param("hostname"); @@ -139,13 +89,4 @@ sub get_chkconfig { $self->render( json => $data_obj ); } -sub get_package_chkconfig
[2/2] incubator-trafficcontrol git commit: This closes #197.
This closes #197. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9d9afe15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9d9afe15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9d9afe15 Branch: refs/heads/master Commit: 9d9afe1583860c6fb65da887bce08f2e7be40118 Parents: edf65f4 Author: Dan KirkwoodAuthored: Fri Jan 20 19:49:46 2017 + Committer: Dan Kirkwood Committed: Fri Jan 20 19:49:46 2017 + -- --
[2/2] incubator-trafficcontrol git commit: This closes #205.
This closes #205. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a00660a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a00660a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a00660a3 Branch: refs/heads/master Commit: a00660a3a2286d0d0c6dd8af14047537be08eaa6 Parents: 00cbf3b Author: Dan KirkwoodAuthored: Fri Jan 20 22:55:27 2017 + Committer: Dan Kirkwood Committed: Fri Jan 20 22:55:27 2017 + -- --
[1/2] incubator-trafficcontrol git commit: Fix UI for postgres case-sensitivity
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 293e486d9 -> a00660a3a Fix UI for postgres case-sensitivity Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/00cbf3bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/00cbf3bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/00cbf3bd Branch: refs/heads/master Commit: 00cbf3bd6a01d5ea23cc742855cb735b04952baf Parents: 293e486 Author: Derek GelinasAuthored: Fri Jan 20 13:25:07 2017 -0500 Committer: Dan Kirkwood Committed: Fri Jan 20 22:55:09 2017 + -- traffic_ops/app/templates/navbar.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/00cbf3bd/traffic_ops/app/templates/navbar.html.ep -- diff --git a/traffic_ops/app/templates/navbar.html.ep b/traffic_ops/app/templates/navbar.html.ep index 76b4ae2..502dc42 100644 --- a/traffic_ops/app/templates/navbar.html.ep +++ b/traffic_ops/app/templates/navbar.html.ep @@ -36,7 +36,7 @@ Parameters - Global Profile + Global Profile All Cache Groups All Profiles Select Profile
[13/30] incubator-trafficcontrol git commit: remove unused 3rd party js files
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/04b15495/traffic_ops/app/public/js/modernizr.custom.09757.js -- diff --git a/traffic_ops/app/public/js/modernizr.custom.09757.js b/traffic_ops/app/public/js/modernizr.custom.09757.js deleted file mode 100644 index 118520b..000 --- a/traffic_ops/app/public/js/modernizr.custom.09757.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* Modernizr 2.7.1 (Custom Build) | MIT & BSD - * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexboxlegacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-cssclasses-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load - */ -;window.Modernizr=function(a,b,c){function C(a){j.cssText=a}function D(a,b){return C(n.join(a+";")+(b||""))}function E(a,b){return typeof a===b}function F(a,b){return!!~(""+a).indexOf(b)}function G(a,b){for(var d in a){var e=a[d];if(!F(e,"-")&[e]!==c)return b=="pfx"?e:!0}return!1}function H(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:E(f,"function")?f.bind(d||b):f}return!1}function I(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return E(b,"string")||E(b,"undefined")?G(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),H(e,b,c))}function J(){e.input=function(c){for(var d=0,e=c.length;d
[02/30] incubator-trafficcontrol git commit: adds license details for experimental TO ui theme and loading bar used in traffic portal and experimental TO UI
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/44ce8a4e/traffic_ops/experimental/ui/app/src/styles/main.scss -- diff --git a/traffic_ops/experimental/ui/app/src/styles/main.scss b/traffic_ops/experimental/ui/app/src/styles/main.scss old mode 100755 new mode 100644 index 2d89add..653e961 --- a/traffic_ops/experimental/ui/app/src/styles/main.scss +++ b/traffic_ops/experimental/ui/app/src/styles/main.scss @@ -44,7 +44,7 @@ $fa-font-path: "../assets/fonts"; // admin @import "../modules/private/admin/admin"; @import "../modules/private/admin/divisions/divisions"; -@import "../modules/private/admin/locations/locations"; +@import "../modules/private/admin/physLocations/physLocations"; @import "../modules/private/admin/regions/regions"; @import "../modules/private/admin/tenants/tenants"; @import "../modules/private/admin/users/users"; @@ -106,558 +106,14 @@ body.nav-sm .container.body .main-content { } } -.input-error { - color: #a94442; - font-weight: bold; -} - -.pagination { - display: inline-block; - padding-left: 0; - margin: 0; - border-radius: 4px; -} - -.modal-footer .btn + .btn { - margin-bottom: 6px; -} - -.border-blue { - border-color: #3498DB !important; -} - -.border-purple { - border-color: #9B59B6 !important; -} - -.border-green { - border-color: #1ABB9C !important; -} - -.border-aero { - border-color: #9CC2CB !important; -} - -.border-red { - border-color: #E74C3C !important; -} - -.border-dark { - border-color: #34495E !important; -} - -.bg-white { - background: #fff !important; - border: 1px solid #fff !important; - color: #73879C; -} - -.bg-red { - background: #E74C3C !important; - border: 1px solid #E74C3C !important; - color: #fff; -} - -.bg-blue { - background: #3498DB !important; - border: 1px solid #3498DB !important; - color: #fff; -} - -.bg-green { - background: #1ABB9C !important; - border: 1px solid #1ABB9C !important; - color: #fff; -} - -.bg-orange { - background: #F39C12 !important; - border: 1px solid #F39C12 !important; - color: #fff; -} - -.bg-purple { - background: #9B59B6 !important; - border: 1px solid #9B59B6 !important; - color: #fff; -} - -.bg-blue-sky { - background: #50C1CF !important; - border: 1px solid #50C1CF !important; - color: #fff; -} - -.no-padding { - padding: 0 !important; -} - -.page-title { - width: 100%; - height: 65px; - padding: 10px 0; -} - -.page-title .title_left { - width: 45%; - float: left; - display: block; -} - -.page-title .title_left h3 { - margin: 9px 0; -} - -.page-title .title_right { - width: 55%; - float: left; - display: block; -} - -.page-title .title_right .pull-right { - margin: 10px 0; -} - -.fixed_height_320 { - height: 320px; -} - -.fixed_height_390 { - height: 390px; -} - -.fixed_height_200 { - height: 200px; -} - -.overflow_hidden { - overflow: hidden -} - -.progress-bar-dark { - background-color: #34495E !important; -} - -.progress-bar-gray { - background-color: #BDC3C7 !important; -} - -table.no-margin .progress { - margin-bottom: 0; -} - -.main_content { - padding: 10px 20px; -} - -.col-md-55 { - width: 50%; - margin-bottom: 10px; -} - -@media (max-width: 992px) { - .tile_stats_count { -margin-bottom: 10px; -border-bottom: 1px solid #D9DEE4; -padding-bottom: 10px; - } -} - -@media (min-width: 992px) and (max-width: 1100px) { - .tile_stats_count .count { -font-size: 35px !important; - } -} - -@media(max-width:768px) { - .tile_stats_count .count { -font-size: 30px !important; - } - .tile_stats_count .right span { -font-size: 12px; - } -} - -@media (min-width: 768px) { - .col-md-55 { -width: 20%; - } -} - -@media (min-width: 992px) { - .col-md-55 { -width: 20%; - } -} - -@media (min-width: 1200px) { - .col-md-55 { -width: 20%; - } -} - -@media (min-width: 192px) and (max-width: 1270px) { - .hidden-small { -display: none !important; - } - table.tile_info span.right { -margin-right: 7px; -float: left; - } -} - -.center-margin { - margin: 0 auto; - float: none!important; -} - -.col-md-55, -.col-xs-1, -.col-sm-1, -.col-md-1, -.col-lg-1, -.col-xs-2, -.col-sm-2, -.col-md-2, -.col-lg-2, -.col-xs-3, -.col-sm-3, -.col-md-3, -.col-lg-3, -.col-xs-4, -.col-sm-4, -.col-md-4, -.col-lg-4, -.col-xs-5, -.col-sm-5, -.col-md-5, -.col-lg-5, -.col-xs-6, -.col-sm-6, -.col-md-6, -.col-lg-6, -.col-xs-7, -.col-sm-7, -.col-md-7, -.col-lg-7, -.col-xs-8, -.col-sm-8, -.col-md-8, -.col-lg-8, -.col-xs-9, -.col-sm-9, -.col-md-9, -.col-lg-9, -.col-xs-10, -.col-sm-10, -.col-md-10, -.col-lg-10, -.col-xs-11, -.col-sm-11, -.col-md-11, -.col-lg-11, -.col-xs-12, -.col-sm-12, -.col-md-12, -.col-lg-12 { - position: relative; - min-height: 1px; - float: left; - padding-right: 10px; - padding-left: 10px; -} - -.row { - margin-right: -10px; - margin-left: -10px; -} - -.grid_slider .col-md-6 { - padding: 0 40px; -} - -h1, -.h1, -h2, -.h2, -h3,
[15/30] incubator-trafficcontrol git commit: remove unused 3rd party js files
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/04b15495/traffic_ops/app/public/js/handlebars.js -- diff --git a/traffic_ops/app/public/js/handlebars.js b/traffic_ops/app/public/js/handlebars.js deleted file mode 100644 index c70f09d..000 --- a/traffic_ops/app/public/js/handlebars.js +++ /dev/null @@ -1,2278 +0,0 @@ -/* - -Copyright (C) 2011 by Yehuda Katz - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -*/ - -// lib/handlebars/browser-prefix.js -var Handlebars = {}; - -(function(Handlebars, undefined) { -; -// lib/handlebars/base.js - -Handlebars.VERSION = "1.0.0"; -Handlebars.COMPILER_REVISION = 4; - -Handlebars.REVISION_CHANGES = { - 1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it - 2: '== 1.0.0-rc.3', - 3: '== 1.0.0-rc.4', - 4: '>= 1.0.0' -}; - -Handlebars.helpers = {}; -Handlebars.partials = {}; - -var toString = Object.prototype.toString, -functionType = '[object Function]', -objectType = '[object Object]'; - -Handlebars.registerHelper = function(name, fn, inverse) { - if (toString.call(name) === objectType) { -if (inverse || fn) { throw new Handlebars.Exception('Arg not supported with multiple helpers'); } -Handlebars.Utils.extend(this.helpers, name); - } else { -if (inverse) { fn.not = inverse; } -this.helpers[name] = fn; - } -}; - -Handlebars.registerPartial = function(name, str) { - if (toString.call(name) === objectType) { -Handlebars.Utils.extend(this.partials, name); - } else { -this.partials[name] = str; - } -}; - -Handlebars.registerHelper('helperMissing', function(arg) { - if(arguments.length === 2) { -return undefined; - } else { -throw new Error("Missing helper: '" + arg + "'"); - } -}); - -Handlebars.registerHelper('blockHelperMissing', function(context, options) { - var inverse = options.inverse || function() {}, fn = options.fn; - - var type = toString.call(context); - - if(type === functionType) { context = context.call(this); } - - if(context === true) { -return fn(this); - } else if(context === false || context == null) { -return inverse(this); - } else if(type === "[object Array]") { -if(context.length > 0) { - return Handlebars.helpers.each(context, options); -} else { - return inverse(this); -} - } else { -return fn(context); - } -}); - -Handlebars.K = function() {}; - -Handlebars.createFrame = Object.create || function(object) { - Handlebars.K.prototype = object; - var obj = new Handlebars.K(); - Handlebars.K.prototype = null; - return obj; -}; - -Handlebars.logger = { - DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3, - - methodMap: {0: 'debug', 1: 'info', 2: 'warn', 3: 'error'}, - - // can be overridden in the host environment - log: function(level, obj) { -if (Handlebars.logger.level <= level) { - var method = Handlebars.logger.methodMap[level]; - if (typeof console !== 'undefined' && console[method]) { -console[method].call(console, obj); - } -} - } -}; - -Handlebars.log = function(level, obj) { Handlebars.logger.log(level, obj); }; - -Handlebars.registerHelper('each', function(context, options) { - var fn = options.fn, inverse = options.inverse; - var i = 0, ret = "", data; - - var type = toString.call(context); - if(type === functionType) { context = context.call(this); } - - if (options.data) { -data = Handlebars.createFrame(options.data); - } - - if(context && typeof context === 'object') { -if(context instanceof Array){ - for(var j = context.length; i
[17/30] incubator-trafficcontrol git commit: roboto-font.css not used
roboto-font.css not used (cherry picked from commit d49588b6a1eff4cd3286b075e4b9492b84e2940d) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/6113be1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6113be1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6113be1f Branch: refs/heads/1.8.x Commit: 6113be1ff27c08194cd03289c9be014ed4051983 Parents: 04b1549 Author: Dan KirkwoodAuthored: Mon Jan 23 15:38:09 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:43:21 2017 -0700 -- traffic_ops/app/public/css/roboto-font.css | 76 - 1 file changed, 76 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6113be1f/traffic_ops/app/public/css/roboto-font.css -- diff --git a/traffic_ops/app/public/css/roboto-font.css b/traffic_ops/app/public/css/roboto-font.css deleted file mode 100644 index 902011c..000 --- a/traffic_ops/app/public/css/roboto-font.css +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/* cyrillic-ext */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(/fonts/sTdaA6j0Psb920Vjv-mrzH-_kf6ByYO6CLYdB4HQE-Y.woff2) format('woff2'); - unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F; -} -/* cyrillic */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(/fonts/uYECMKoHcO9x1wdmbyHIm3-_kf6ByYO6CLYdB4HQE-Y.woff2) format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* greek-ext */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(/fonts/tnj4SB6DNbdaQnsM8CFqBX-_kf6ByYO6CLYdB4HQE-Y.woff2) format('woff2'); - unicode-range: U+1F00-1FFF; -} -/* greek */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(/fonts/_VYFx-s824kXq_Ul2BHqYH-_kf6ByYO6CLYdB4HQE-Y.woff2) format('woff2'); - unicode-range: U+0370-03FF; -} -/* vietnamese */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(/fonts/NJ4vxlgWwWbEsv18dAhqnn-_kf6ByYO6CLYdB4HQE-Y.woff2) format('woff2'); - unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(/fonts/Ks_cVxiCiwUWVsFWFA3Bjn-_kf6ByYO6CLYdB4HQE-Y.woff2) format('woff2'); - unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url(/fonts/oMMgfZMQthOryQo9n22dcuvvDin1pK8aKteLpeZ5c0A.woff2) format('woff2'); - unicode-range: U+-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; -} -
[18/30] incubator-trafficcontrol git commit: remove unused license entries
remove unused license entries (cherry picked from commit a5d448b55269c8f9d26bd581e5ac6c5ba9cdb10f) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/08bdf1d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/08bdf1d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/08bdf1d1 Branch: refs/heads/1.8.x Commit: 08bdf1d12a99b4b874f4badf690f4531c4c6354a Parents: 6113be1 Author: Dan KirkwoodAuthored: Mon Jan 23 15:50:20 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:43:43 2017 -0700 -- LICENSE | 38 .../app/public/css/jquery-ui.structure.min.css | 24 - 2 files changed, 62 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/08bdf1d1/LICENSE -- diff --git a/LICENSE b/LICENSE index ac6eb1b..17744d9 100644 --- a/LICENSE +++ b/LICENSE @@ -291,16 +291,6 @@ For the jMenu component: ** */ -For the crossfilter component: - -Copyright 2012 Square, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at - - http://www.apache.org/licenses/LICENSE-2.0 - For the DataTables component: /** @@ -398,40 +388,12 @@ the MPL, so the ssl-bundle.crt is likewise licensed under the MPL: Mozilla Public License Version 2.0: https://www.mozilla.org/en-US/MPL/2.0/ -For the handlebars.js component: - -Copyright (C) 2011 by Yehuda Katz - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - For the Select2 component: The Apache License http://www.apache.org/licenses/LICENSE-2.0 Copyright (c) 2012-2015 Kevin Brown, Igor Vaynberg, and Select2 contributors -For the modernizr component: - -Copyright © 2009-2016 - -The MIT License (MIT): https://modernizr.com/license/ - For the prettyprint component: /* http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/08bdf1d1/traffic_ops/app/public/css/jquery-ui.structure.min.css -- diff --git a/traffic_ops/app/public/css/jquery-ui.structure.min.css b/traffic_ops/app/public/css/jquery-ui.structure.min.css deleted file mode 100644 index fa140a4..000 --- a/traffic_ops/app/public/css/jquery-ui.structure.min.css +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/*! jQuery UI - v1.11.2 - 2014-10-19 -* http://jqueryui.com -* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */ - -.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0
[12/30] incubator-trafficcontrol git commit: add angular-loading-bar license
add angular-loading-bar license (cherry picked from commit d1b6ba8c2317ca5fcd3528276dd813cb314c30c6) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d8ff7468 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d8ff7468 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d8ff7468 Branch: refs/heads/1.8.x Commit: d8ff7468b0dcb95d239bbf6b57a5dace0963baaa Parents: 03af4a2 Author: Dan KirkwoodAuthored: Mon Jan 23 13:19:08 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:42:29 2017 -0700 -- LICENSE | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d8ff7468/LICENSE -- diff --git a/LICENSE b/LICENSE index dc2c1b5..ac6eb1b 100644 --- a/LICENSE +++ b/LICENSE @@ -472,3 +472,15 @@ policies, either expressed or implied, of James Padolsey. Benjamin Drucker */ + +For the angular-loading-bar component: + +/*! + * angular-loading-bar v0.4.2 + * https://chieffancypants.github.io/angular-loading-bar + * Copyright (c) 2014 Wes Cruver + * License: MIT + */ + +https://github.com/chieffancypants/angular-loading-bar/blob/master/LICENSE +
[21/30] incubator-trafficcontrol git commit: Expanded link to files for bootstrap in LICENSE.
Expanded link to files for bootstrap in LICENSE. (cherry picked from commit 601b72ebd105de921421494e0e76c0d49b55ef05) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/56d459d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/56d459d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/56d459d4 Branch: refs/heads/1.8.x Commit: 56d459d4b64edd94534597bda6d78722bdc9936d Parents: 9e6a59b Author: Chris LemmonsAuthored: Tue Jan 24 09:30:45 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:44:34 2017 -0700 -- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/56d459d4/LICENSE -- diff --git a/LICENSE b/LICENSE index 8568f37..e4f3475 100644 --- a/LICENSE +++ b/LICENSE @@ -233,7 +233,7 @@ For the fontawesome component: */ For the bootstrap component: -@misc/traffic-control-cdn/css/bootstrap* +@misc/traffic-control-cdn/*/bootstrap* /*! * Bootstrap v3.2.0 (http://getbootstrap.com)
[1/2] incubator-trafficcontrol git commit: Added missing header to Server.pm.
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 60c84ba5d -> 82b5f6c60 Added missing header to Server.pm. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d4d54ad0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d4d54ad0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d4d54ad0 Branch: refs/heads/master Commit: d4d54ad012fda4440cf579bde9246527d1a81944 Parents: 60c84ba Author: Chris LemmonsAuthored: Tue Jan 24 15:55:32 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 16:00:15 2017 -0700 -- traffic_ops/app/lib/Schema/Result/Server.pm | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d4d54ad0/traffic_ops/app/lib/Schema/Result/Server.pm -- diff --git a/traffic_ops/app/lib/Schema/Result/Server.pm b/traffic_ops/app/lib/Schema/Result/Server.pm index 33a4dff..33c2217 100644 --- a/traffic_ops/app/lib/Schema/Result/Server.pm +++ b/traffic_ops/app/lib/Schema/Result/Server.pm @@ -504,4 +504,16 @@ __PACKAGE__->belongs_to( # Created by DBIx::Class::Schema::Loader v0.07046 @ 2016-11-18 22:45:19 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3f6+Y6k32Vn3CDG7R7uToQ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. 1;
[2/2] incubator-trafficcontrol git commit: This closes #227.
This closes #227. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/0f0f320c Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0f0f320c Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0f0f320c Branch: refs/heads/master Commit: 0f0f320cd50fcd469a263678178eca069a23db84 Parents: 1a6aa39 Author: Dan KirkwoodAuthored: Tue Jan 24 16:11:46 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 16:11:46 2017 -0700 -- --
[2/2] incubator-trafficcontrol git commit: This closes #228.
This closes #228. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c78c9b08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c78c9b08 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c78c9b08 Branch: refs/heads/master Commit: c78c9b08f7a564387645cdf57e52bd1f733caf84 Parents: 110cde7 Author: Dan KirkwoodAuthored: Tue Jan 24 16:23:35 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 16:23:35 2017 -0700 -- --
[2/2] incubator-trafficcontrol git commit: This closes #225.
This closes #225. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/60c84ba5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/60c84ba5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/60c84ba5 Branch: refs/heads/master Commit: 60c84ba5d4f19fa0145c4988791c50eca9b2934c Parents: bddcf3d Author: Dan KirkwoodAuthored: Tue Jan 24 15:56:22 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 15:56:22 2017 -0700 -- --
[1/2] incubator-trafficcontrol git commit: Removed a file that merely uses jmenu from the list of jmenu-licensed things.
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 3aef457dd -> 60c84ba5d Removed a file that merely uses jmenu from the list of jmenu-licensed things. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bddcf3da Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bddcf3da Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bddcf3da Branch: refs/heads/master Commit: bddcf3da429cabf04c2124c01ecad4118e20e087 Parents: 3aef457 Author: Chris LemmonsAuthored: Tue Jan 24 15:37:39 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 15:56:05 2017 -0700 -- LICENSE | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bddcf3da/LICENSE -- diff --git a/LICENSE b/LICENSE index d831721..f99bf38 100644 --- a/LICENSE +++ b/LICENSE @@ -296,7 +296,6 @@ http://jquery.org/license For the jMenu component: @traffic_ops/app/public/*/jMenu.* @traffic_ops/app/public/*/jmenu.* -@traffic_ops/app/templates/jmenu.html.ep / *
[incubator-trafficcontrol] Git Push Summary
Repository: incubator-trafficcontrol Updated Tags: refs/tags/RELEASE-1.8.0-RC9 [created] 4cbc8f81a
[03/30] incubator-trafficcontrol git commit: adds license details for experimental TO ui theme and loading bar used in traffic portal and experimental TO UI
adds license details for experimental TO ui theme and loading bar used in traffic portal and experimental TO UI (cherry picked from commit 57068b4ce64e32a5374417fcab774f0e5d97f6eb) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/44ce8a4e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/44ce8a4e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/44ce8a4e Branch: refs/heads/1.8.x Commit: 44ce8a4eb67ae439c679bd686515d6305c13fea4 Parents: 597e779 Author: Jeremy MitchellAuthored: Tue Jan 24 11:15:41 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:40:38 2017 -0700 -- traffic_ops/experimental/ui/app/src/index.html |2 + .../experimental/ui/app/src/styles/loading.scss | 110 + .../experimental/ui/app/src/styles/main.scss| 5954 +- .../experimental/ui/app/src/styles/theme.scss | 4174 traffic_portal/app/src/index.html |1 + traffic_portal/app/src/styles/loading.scss | 110 + traffic_portal/app/src/styles/main.scss | 113 - 7 files changed, 4406 insertions(+), 6058 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/44ce8a4e/traffic_ops/experimental/ui/app/src/index.html -- diff --git a/traffic_ops/experimental/ui/app/src/index.html b/traffic_ops/experimental/ui/app/src/index.html index ee95434..ac22f1d 100644 --- a/traffic_ops/experimental/ui/app/src/index.html +++ b/traffic_ops/experimental/ui/app/src/index.html @@ -30,6 +30,8 @@ under the License. + + http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/44ce8a4e/traffic_ops/experimental/ui/app/src/styles/loading.scss -- diff --git a/traffic_ops/experimental/ui/app/src/styles/loading.scss b/traffic_ops/experimental/ui/app/src/styles/loading.scss new file mode 100644 index 000..eef92fe --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/styles/loading.scss @@ -0,0 +1,110 @@ +/*! + * angular-loading-bar v0.4.2 + * https://chieffancypants.github.io/angular-loading-bar + * Copyright (c) 2014 Wes Cruver + * License: MIT + */ + +/* Make clicks pass-through */ +#loading-bar, +#loading-bar-spinner { + pointer-events: none; + -webkit-pointer-events: none; + -webkit-transition: 350ms linear all; + -moz-transition: 350ms linear all; + -o-transition: 350ms linear all; + transition: 350ms linear all; +} + +#loading-bar.ng-enter, +#loading-bar.ng-leave.ng-leave-active, +#loading-bar-spinner.ng-enter, +#loading-bar-spinner.ng-leave.ng-leave-active { + opacity: 0; +} + +#loading-bar.ng-enter.ng-enter-active, +#loading-bar.ng-leave, +#loading-bar-spinner.ng-enter.ng-enter-active, +#loading-bar-spinner.ng-leave { + opacity: 1; +} + +#loading-bar .bar { + -webkit-transition: width 350ms; + -moz-transition: width 350ms; + -o-transition: width 350ms; + transition: width 350ms; + + background: #29d; + position: fixed; + z-index: 2000; + top: 0; + left: 0; + width: 100%; + height: 2px; + border-bottom-right-radius: 1px; + border-top-right-radius: 1px; +} + +/* Fancy blur effect */ +#loading-bar .peg { + position: absolute; + width: 70px; + right: 0; + top: 0; + height: 2px; + opacity: .45; + -moz-box-shadow: #29d 1px 0 6px 1px; + -ms-box-shadow: #29d 1px 0 6px 1px; + -webkit-box-shadow: #29d 1px 0 6px 1px; + box-shadow: #29d 1px 0 6px 1px; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; + border-radius: 100%; +} + +#loading-bar-spinner { + display: none; + position: fixed; + z-index: 2000; + top: 10px; + left: 10px; +} + +#loading-bar-spinner .spinner-icon { + width: 14px; + height: 14px; + + border: solid 2px transparent; + border-top-color: #29d; + border-left-color: #29d; + border-radius: 10px; + + -webkit-animation: loading-bar-spinner 400ms linear infinite; + -moz-animation:loading-bar-spinner 400ms linear infinite; + -ms-animation: loading-bar-spinner 400ms linear infinite; + -o-animation: loading-bar-spinner 400ms linear infinite; + animation: loading-bar-spinner 400ms linear infinite; +} + +@-webkit-keyframes loading-bar-spinner { + 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); } +} +@-moz-keyframes loading-bar-spinner { + 0% { -moz-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -moz-transform: rotate(360deg); transform: rotate(360deg); } +} +@-o-keyframes loading-bar-spinner { + 0% { -o-transform:
[24/30] incubator-trafficcontrol git commit: updates main TC license file
updates main TC license file (cherry picked from commit d82c665902239764b9819fd5f9763fe250db9492) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/0d978471 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0d978471 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0d978471 Branch: refs/heads/1.8.x Commit: 0d978471df89837723ba625ed4af9eb777cd8268 Parents: 0b7ba51 Author: Jeremy MitchellAuthored: Tue Jan 24 11:52:52 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:57:31 2017 -0700 -- LICENSE | 35 +-- 1 file changed, 25 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0d978471/LICENSE -- diff --git a/LICENSE b/LICENSE index 1a16fc8..0625f9f 100644 --- a/LICENSE +++ b/LICENSE @@ -334,6 +334,31 @@ For the ng-map component: * Copyright (c) 2014, 2015, 1016 Allen Kim */ +For the angular-loading-bar component: +@traffic_ops/experimental/ui/app/src/styles/loading.scss +@traffic_portal/app/src/styles/loading.scss + +/** + * angular-loading-bar v0.4.2 + * https://chieffancypants.github.io/angular-loading-bar + * Copyright (c) 2014 Wes Cruver + * License: MIT + */ + +https://github.com/chieffancypants/angular-loading-bar/blob/master/LICENSE + +For the gentella admin theme: +@traffic_ops/experimental/ui/app/src/styles/theme.scss + +/** + * gentelella v1.3.0 + * https://colorlib.com/polygon/gentelella/index.html + * Copyright (c) 2016 Aigars Silkalns & Colorlib + * License: MIT + */ + +https://github.com/puikinsh/gentelella/blob/master/LICENSE.txt + For the underscore component: @traffic_ops/experimental/ui/app/src/assets/js/underscore-min_1.8.3.js @@ -529,13 +554,3 @@ Several subsections of main.css are under the MIT license, as noted in the file: For the bootstrap-progressbar component: /*! bootstrap-progressbar v0.8.4 | Copyright (c) 2012-2014 Stephan Groà | MIT license | http://www.minddust.com */ -For the angular-loading-bar component: - -/*! - * angular-loading-bar v0.4.2 - * https://chieffancypants.github.io/angular-loading-bar - * Copyright (c) 2014 Wes Cruver - * License: MIT - */ - -https://github.com/chieffancypants/angular-loading-bar/blob/master/LICENSE
[20/30] incubator-trafficcontrol git commit: Added links to the files themselves to the LICENSE.
Added links to the files themselves to the LICENSE. This lets readers know where the components are located and is machine readable so as to allow grepping the license file for dependencies. (cherry picked from commit c8a983ef2d0d928b03c6eae26cde35fe905f04ba) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9e6a59b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9e6a59b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9e6a59b6 Branch: refs/heads/1.8.x Commit: 9e6a59b636892aa9cd3b5a9e16f23e8b35eb47fc Parents: 5bffaa5 Author: Chris LemmonsAuthored: Tue Jan 24 09:22:46 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:44:34 2017 -0700 -- LICENSE | 35 +++ 1 file changed, 31 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9e6a59b6/LICENSE -- diff --git a/LICENSE b/LICENSE index 17744d9..8568f37 100644 --- a/LICENSE +++ b/LICENSE @@ -202,25 +202,30 @@ limitations under the License. -APACHE TRAFFICCONTROL SUBCOMPONENTS: +APACHE TRAFFICCONTROL SUBCOMPONENTS: Apache TrafficControl includes a number of subcomponents with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and -conditions of the following licenses. +conditions of the following licenses. For the sphinx_rtd_theme component: +@docs/source/_themes/sphinx_rtd_theme/* The MIT License (MIT): https://github.com/snide/sphinx_rtd_theme/blob/master/LICENSE Copyright (c) 2013 Dave Snider For the sphinx_rtd_theme/search.html component: +@docs/source/_themes/sphinx_rtd_theme/search.html :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. For the fontawesome component: +@docs/source/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf +@docs/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.* + /* * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome @@ -228,6 +233,7 @@ For the fontawesome component: */ For the bootstrap component: +@misc/traffic-control-cdn/css/bootstrap* /*! * Bootstrap v3.2.0 (http://getbootstrap.com) @@ -238,6 +244,7 @@ For the bootstrap component: /*! normalize.css v3.0.1 | MIT License | git.io/normalize */ For the sorttable component: +@traffic_monitor/experimental/traffic_monitor/static/sorttable.js /* SortTable @@ -267,6 +274,7 @@ For the jQuery component: */ For the jQuery UI component: +@traffic_ops/app/public/css/jquery-ui.structure.css jQuery UI CSS Framework 1.11.2 http://jqueryui.com @@ -278,6 +286,9 @@ http://jquery.org/license For the jMenu component: +@traffic_ops/app/public/*/jMenu.* +@traffic_ops/app/public/*/jmenu.* +@traffic_ops/app/templates/jmenu.html.ep / * @@ -292,6 +303,10 @@ For the jMenu component: */ For the DataTables component: +@traffic_ops/app/public/js/jquery.dataTables.js +@traffic_ops/experimental/ui/app/src/assets/css/jquery.dataTables.min.css +@traffic_ops/experimental/ui/app/src/assets/js/dataTables.tableTools.js +@traffic_ops/experimental/ui/app/src/assets/js/jquery.dataTables.min.js /** * @summary DataTables @@ -309,16 +324,18 @@ For the DataTables component: */ For the ng-map component: +@traffic_ops/experimental/ui/app/src/assets/js/ng-map_1.17.6.min.js /** * AngularJS Google Maps Ver. 1.17.3 * * The MIT License (MIT) - * + * * Copyright (c) 2014, 2015, 1016 Allen Kim */ For the underscore component: +@traffic_ops/experimental/ui/app/src/assets/js/underscore-min_1.8.3.js // Underscore.js 1.8.3 // http://underscorejs.org @@ -326,12 +343,14 @@ For the underscore component: // Underscore may be freely distributed under the MIT license. For the selenium component: +@infrastructure/test/ui/vendor/github.com/tebeka/selenium/* Copyright (c) 2012-2016 The Selenium Go Client Authors. This project is licensed under the MIT license. For the gmx component: +@traffic_monitor/experimental/vendor/github.com/davecheney/gmx/* Copyright (c) 2012, David Cheney All rights reserved. @@ -339,6 +358,7 @@ All rights reserved. ./traffic_monitor/experimental/vendor/github.com/davecheney/gmx/LICENCE For the stoppableListener component:
[14/30] incubator-trafficcontrol git commit: remove unused 3rd party js files
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/04b15495/traffic_ops/app/public/js/jqtree/tree.jquery.js -- diff --git a/traffic_ops/app/public/js/jqtree/tree.jquery.js b/traffic_ops/app/public/js/jqtree/tree.jquery.js deleted file mode 100644 index e02a9f3..000 --- a/traffic_ops/app/public/js/jqtree/tree.jquery.js +++ /dev/null @@ -1,3341 +0,0 @@ -(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&if(!u&)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&for(var o=0;o
[26/30] incubator-trafficcontrol git commit: removes self-signed certs provided for convenience from TO UI experimental
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8c8b6b53/traffic_ops/experimental/ui/ssl/tls/certs/ssl.crt -- diff --git a/traffic_ops/experimental/ui/ssl/tls/certs/ssl.crt b/traffic_ops/experimental/ui/ssl/tls/certs/ssl.crt deleted file mode 100644 index c738191..000 --- a/traffic_ops/experimental/ui/ssl/tls/certs/ssl.crt +++ /dev/null @@ -1,25 +0,0 @@ --BEGIN CERTIFICATE- -MIIEKTCCAxGgAwIBAgIJAIEz+7FxoY7FMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD -VQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRUwEwYDVQQHEwxQaGlsYWRl -bHBoaWExEDAOBgNVBAoTB0NvbWNhc3QxJTAjBgNVBAsTHE5hdGlvbmFsIFNlY3Vy -aXR5IE9wZXJhdGlvbnMxKzApBgNVBAMTIk5hdGlvbmFsU2VjdXJpdHlPcGVyYXRp -b25zIENBIDIwMTAwHhcNMTQwNjEzMTQxMzEwWhcNMTkwNjEyMTQxMzEwWjCByjEL -MAkGA1UEBhMCVVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEVMBMGA1UEBwwMUGhp -bGFkZWxwaGlhMTQwMgYDVQQKDCtDb21jYXN0IENhYmxlIENvbW11bmljYXRpb25z -IE1hbmFnZW1lbnQgTExDMSUwIwYDVQQDDBxwb3J0YWwtY2kuY2RubGFiLmNvbWNh -c3QubmV0MTAwLgYJKoZIhvcNAQkBFiFORVRPLVZTUy1DRE5FTkdAY2FibGUuY29t -Y2FzdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEt7e31s4B -0CPAxb6EbX1IkW7ururpgMXTT/hECi9UQ0JPkWJQMAdaXTg3i8lWW6jBp4bAAMag -hD6iwusSmdvBOYtjSGu6EvN9kvUx1gRJEuORWAQ6y73WnFLyMq46h/pm6e03aKOg -AllTEsaxcga0MWDYgc1XBZzfZOQoEERZlFPw/EeKCT3OplOUxK/x6NyRKtNPsFA+ -DkcEGfoTM/woP1BgEHCBQmNeBH5ulB671CIl+ove02K57rNuMJNRK/KmQvOd7jCz -ZhkyY2/85fH1nt1Pa5oz++GhzHn4dOkGzm+zhadghl7hygXwjSvjJyU8Z9jwkWss -oFutIG8073W9AgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud -DgQWBBRyiWzdXIJbGXcsIGB0lr0UI0mSCzANBgkqhkiG9w0BAQUFAAOCAQEARlrU -Et0mnKGlM6HlY5LFr1M58Yu/+vv7oZtEmb+1WoDJBSM5Uioy9c16DYUQu+jliYbA -7YSVXoguDAtRxuk9fJO03mqUzS6WoT1azREpDs2GVjhieUG7psuprjFVH8uydLuw -bgmWSDO7I038dXDL1+3J4E2bqLkWQd+yUv6LfekY+fG5OLlF3fOJFz83kPaq6BrY -ne498VanPekVXqm/KszPOMKQnz5SeFXM3G41gEg/IBdp8ymm0FPDVDs84gwz3hy/ -S9W39n4coGaAHt4te56Z80xptVu30uHjbJyZqHPGkxorMD3VKsT4QvK2c/xqTTBa -TfttQqut6xtDMsywHw== --END CERTIFICATE- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8c8b6b53/traffic_ops/experimental/ui/ssl/tls/private/ssl.key -- diff --git a/traffic_ops/experimental/ui/ssl/tls/private/ssl.key b/traffic_ops/experimental/ui/ssl/tls/private/ssl.key deleted file mode 100644 index 69fbf41..000 --- a/traffic_ops/experimental/ui/ssl/tls/private/ssl.key +++ /dev/null @@ -1,28 +0,0 @@ --BEGIN PRIVATE KEY- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDEt7e31s4B0CPA -xb6EbX1IkW7ururpgMXTT/hECi9UQ0JPkWJQMAdaXTg3i8lWW6jBp4bAAMaghD6i -wusSmdvBOYtjSGu6EvN9kvUx1gRJEuORWAQ6y73WnFLyMq46h/pm6e03aKOgAllT -Esaxcga0MWDYgc1XBZzfZOQoEERZlFPw/EeKCT3OplOUxK/x6NyRKtNPsFA+DkcE -GfoTM/woP1BgEHCBQmNeBH5ulB671CIl+ove02K57rNuMJNRK/KmQvOd7jCzZhky -Y2/85fH1nt1Pa5oz++GhzHn4dOkGzm+zhadghl7hygXwjSvjJyU8Z9jwkWssoFut -IG8073W9AgMBAAECggEBALD9rxF79ewRriligXC65i7lkw6zWG5wywy99dyZ4U2K -Gl5mqzMEk4kNOGhZn/PQEjzykr2rtQp1Ebn1b/VTczIdqTjRzwMiy+rezzdgnIh2 -s0NxEpUn/Qzbp5F8YeANuhDgRetFfXqYwm+JBDZhJoD3sG/8EZlLVoJ0Twdw415I -DLi/0UPvkbQ2vw+0S1Qu0TAfLfLOuApIk7gJC34IDMMckGKKleheUQHz5mv2wqg+ -RvyzuCJ2h9bZV3yw3D1r03s1YsaixLXjIc8BXNISuE8aKFmeiO24e+hXc1lJDV7G -FgXp8zPbvW8OUpWtV9OFtKTLUkmYr54kSzp9835su20CgYEA/KvRIS054hDTD493 -0P1WHy4LPqjQ7jON6sfnymUJIPGy8SCeJm+nfjQdDJSxHlaT9PBpipndq77TnRMm -pCtLCJvDq6i3o17jjuQHXGBpT4pz4567Py9o9OZbU0z8lFUDiBfF8kcAzcJvjFvb -RbBKtA2KCHCogSUfE+2b5U2w2K8CgYEAx08vwHi4+8kKuTyKbOaKaB+kE3gFGmRr -zHUaFGJ3NBjb/WApA9BZt9LY+QI+vGk5N1EE9cNxo483oJT/QjJIONcTi53aruVt -b/BwIG4U+UbQYMpHTgf51ZVxcF5wvA8gHO+N2Bfu2BTwZ02JfpaE7tWT/7kffJRR -ymq8KJBdW1MCgYEAzK3ehjKdvhyE7Qj6NWjTOATThRm5zgwjPXpcsR6xi2df3mbe -1iICm4BZu9RDumDGEFgkFuvXnwXBZG+cEMclTD7p/gd5YzU9v4XG1LUg+hcdE9mE -s4WTTze/6TXnMb3AU6F2b3HHG+cS9699a/GIQlzpYTbpuVw51anYbKNHy+8CgYBC -SQ+0j3HWK1KpsHzJIxM89ej3oJ7x3BwN75Qw216RsQLZDbYWUqDEBherGRgMSWKC -BywDIHEW2HbDrUoHlfl3DfCuKl2kdSEkbW6dGn9XODntNtjoFrb8VatYl9Aee1lO -xk0CZVNGAhDCCoOD2kNzuwxxq/vQzvM0wrK5OuoRiQKBgQDdwzCuiw6jxF0FO/GM -se+QiTSFrro4iruwQnJS/CTLrPOkUqC+uF00HxtP0IV8LVvVajLtEMSLoWNQaX6M -ETA8RIpEiCJi+D9n8Bj4QPH/rNrnX/scankQNzqboFPv8uxGxOm5H0qYJGq3YvdY -AqlQqdFLTQo936wf81iUd60kvg== --END PRIVATE KEY-
[2/2] incubator-trafficcontrol git commit: This closes #226.
This closes #226. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/82b5f6c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/82b5f6c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/82b5f6c6 Branch: refs/heads/master Commit: 82b5f6c6061e97cf3240dbf2f9ba13cc0f0a7f15 Parents: d4d54ad Author: Dan KirkwoodAuthored: Tue Jan 24 16:00:48 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 16:00:48 2017 -0700 -- --
incubator-trafficcontrol git commit: Added modernizr to the license file again, since we do use the minified version.
Repository: incubator-trafficcontrol Updated Branches: refs/heads/1.8.x 346a61c61 -> 2301659f6 Added modernizr to the license file again, since we do use the minified version. (cherry picked from commit 1a6aa39268aa3ce997ab5ed695f09595c1974ff5) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2301659f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2301659f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2301659f Branch: refs/heads/1.8.x Commit: 2301659f699948d9944cc07bc92b9f6a56bc4678 Parents: 346a61c Author: Chris LemmonsAuthored: Tue Jan 24 16:09:27 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 16:12:33 2017 -0700 -- LICENSE | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2301659f/LICENSE -- diff --git a/LICENSE b/LICENSE index afe013f..b329a33 100644 --- a/LICENSE +++ b/LICENSE @@ -222,6 +222,11 @@ For the sphinx_rtd_theme/search.html component: :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. +For the modernizr component: +@docs/source/_themes/sphinx_rtd_theme/static/js/modernizr.min.js + +Modernizr 2.6.2 (Custom Build) | MIT & BSD + For the fontawesome component: @docs/source/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf @docs/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.*
svn commit: r18381 - in /dev/incubator/trafficcontrol/1.8.0/RC11: ./ trafficcontrol-incubating-1.8.0.tar.gz trafficcontrol-incubating-1.8.0.tar.gz.asc trafficcontrol-incubating-1.8.0.tar.gz.md5 traffi
Author: dangogh Date: Fri Feb 17 19:52:12 2017 New Revision: 18381 Log: trafficcontrol-incubating-1.8.0-RC11 Added: dev/incubator/trafficcontrol/1.8.0/RC11/ dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz (with props) dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.asc dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.md5 dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.sha1 Added: dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz -- svn:mime-type = application/octet-stream Added: dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.asc == --- dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.asc (added) +++ dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.asc Fri Feb 17 19:52:12 2017 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJYp1QVAAoJEMSzPIBFh6jwloAQAKhNaB0TG+Ol6TKdxcF+aeU1 +qoJFz8I+FgWsFVmuF/fxUKKaB4iCQ2Ot+Du+RutYGpblz4dxQ27QbngmSDGWqCfU +Z2dnLErZZPKS4eo8DIt2N3zroDtJBXpFFLEY+7F/Y7z/LSSCBAwrHcUDtg0TJitI +jPVuMb2xAuhy1DoOx4C6K0KxwxkISsB061MJuS3S5+J99FnqlJLFklBIKxgxehYx +HlkkQPTOe4Xxqg/PL9CiQJ393rKv30wKDraTVulieiJfKTiHcerEgkP2RmrV2iuM +gnYt5+4Jsh12HIe5iRfJqCknq8EPexz2kpyZM0pa78v4UK9cq9PqOZ5o7T7pRZRj +790+6riMOg46X80KAQlgTpcR9SpVb9qJDSpbEDJQjspwjY/qgSEl1W6Q6I7ixw1V +mhvLwdQJlU0SPlG4vKdBCGqeOYWcDtRXdEMe0pM5PyAXX7LTi7AVU0wR+WT8eqBJ +LoU9k9wCEPsRRD7LM2icuF/PttoZB312qggrfYGdt4JD44yB15/X8BRXofTvZtB4 +1zAlNPm5XY1pIDEDEdPslst9xIOqQB1/dqgGk+cbbV0J5gplXPxsN1Y+27yO+W3X +SX0iMt380e+z9yv+W8ky8ut2uj3NtGcr5a8IXG3uEE4nP8+ima7PfLLaAwMbH6Ii +jv1jPadRXy5jw5BhwhhV +=Oo0F +-END PGP SIGNATURE- Added: dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.md5 == --- dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.md5 (added) +++ dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.md5 Fri Feb 17 19:52:12 2017 @@ -0,0 +1 @@ +8e9344e401a4a0d89364e504984f8b54 trafficcontrol-incubating-1.8.0.tar.gz Added: dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.sha1 == --- dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.sha1 (added) +++ dev/incubator/trafficcontrol/1.8.0/RC11/trafficcontrol-incubating-1.8.0.tar.gz.sha1 Fri Feb 17 19:52:12 2017 @@ -0,0 +1 @@ +38e031de2c3ade81cde172f3b3677a5a88ab1d39 trafficcontrol-incubating-1.8.0.tar.gz
[incubator-trafficcontrol] Git Push Summary
Repository: incubator-trafficcontrol Updated Tags: refs/tags/RELEASE-1.8.0-RC11 [created] 4898d5b69
[2/2] incubator-trafficcontrol git commit: This closes #303.
This closes #303. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/feffd67e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/feffd67e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/feffd67e Branch: refs/heads/master Commit: feffd67e711d3c62889b61ae747233ea90ce689e Parents: 7f704f5 Author: Dan KirkwoodAuthored: Thu Feb 23 17:49:41 2017 -0700 Committer: Dan Kirkwood Committed: Thu Feb 23 17:49:41 2017 -0700 -- --
[1/2] incubator-trafficcontrol git commit: riak_adapter and ssl_key tests now pass
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master c25149c8a -> feffd67e7 riak_adapter and ssl_key tests now pass Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7f704f52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7f704f52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7f704f52 Branch: refs/heads/master Commit: 7f704f52c7ecf94bc836673a94b7e7dd48fd2c8e Parents: c25149c Author: Dave NeumanAuthored: Thu Feb 23 14:41:23 2017 -0700 Committer: Dan Kirkwood Committed: Thu Feb 23 17:49:07 2017 -0700 -- traffic_ops/app/lib/Connection/RiakAdapter.pm | 2 +- traffic_ops/app/t/api/1.1/riak_adapter.t | 11 +++ 2 files changed, 4 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7f704f52/traffic_ops/app/lib/Connection/RiakAdapter.pm -- diff --git a/traffic_ops/app/lib/Connection/RiakAdapter.pm b/traffic_ops/app/lib/Connection/RiakAdapter.pm index 474bc69..440903f 100755 --- a/traffic_ops/app/lib/Connection/RiakAdapter.pm +++ b/traffic_ops/app/lib/Connection/RiakAdapter.pm @@ -108,7 +108,7 @@ sub delete { my $key = shift || confess("Supply a key"); my $key_uri = $self->get_key_uri( $bucket, $key ); my $key_ctx = $self->get_url($key_uri); - return $ua->delete( $self->$key_ctx ); + return $ua->delete( $key_ctx ); } sub get { http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7f704f52/traffic_ops/app/t/api/1.1/riak_adapter.t -- diff --git a/traffic_ops/app/t/api/1.1/riak_adapter.t b/traffic_ops/app/t/api/1.1/riak_adapter.t index 1c2a3d4..5f0d8a6 100644 --- a/traffic_ops/app/t/api/1.1/riak_adapter.t +++ b/traffic_ops/app/t/api/1.1/riak_adapter.t @@ -52,12 +52,12 @@ is( $key_uri, "/riak/" . BUCKET . "/" . KEY ); my $response = $riak_util->get( BUCKET, KEY ); is( $response->{_rc},200 ); is( $response->{_headers}->{'content-type'}, 'application/json' ); -is( $fake_answer,$response->{_content} ); +is( $fake_answer, $response->{_content} ); #PUT $response = $riak_util->put( BUCKET, KEY, "value1" ); is( $response->{_rc}, 200 ); -is( $fake_answer, $response->{_content} ); +is( $fake_answer, $response->{_content} ); #PUT - With Content Type $response = $riak_util->put( BUCKET, KEY, "value1", "application/json" ); @@ -67,7 +67,7 @@ is( $fake_answer, $response->{_content} ); #DELETE $response = $riak_util->delete( BUCKET, KEY ); is( $response->{_rc}, 200 ); -is( $fake_answer, $response->{_content} ); +is( $fake_answer, $response->{_content} ); #PING $response = $riak_util->ping(); @@ -79,9 +79,4 @@ $response = $riak_util->stats(); is( $response->{_rc}, 200 ); is( $fake_answer, $response->{_content} ); -#diag "response: " . Dumper($response); -#my $response = $riak_util->send_retry( sub { Utils::Riak->get( BUCKET, KEY ) } ); - -#my $response = $riak_util->get( BUCKET, KEY ); - done_testing();
[1/2] incubator-trafficcontrol git commit: $self needs to be passed to these methods for dbix
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 03ca38e33 -> 06b56aeae $self needs to be passed to these methods for dbix Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/40af705f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/40af705f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/40af705f Branch: refs/heads/master Commit: 40af705f2b3b75f9d782572d7f73721fa57b550d Parents: 03ca38e Author: Jeremy MitchellAuthored: Fri Feb 24 11:24:27 2017 -0700 Committer: Dan Kirkwood Committed: Fri Feb 24 11:40:50 2017 -0700 -- traffic_ops/app/lib/UI/DeliveryService.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/40af705f/traffic_ops/app/lib/UI/DeliveryService.pm -- diff --git a/traffic_ops/app/lib/UI/DeliveryService.pm b/traffic_ops/app/lib/UI/DeliveryService.pm index 31f4854..a466a50 100644 --- a/traffic_ops/app/lib/UI/DeliveryService.pm +++ b/traffic_ops/app/lib/UI/DeliveryService.pm @@ -1131,8 +1131,8 @@ sub create_dnssec_keys { my $dnskey_ttl = get_key_ttl( $cdn_ksk, "60" ); #create the ds domain name for dnssec keys - my $domain_name = get_cdn_domain($ds_id); - my $deliveryservice_regexes = get_regexp_set($ds_id); + my $domain_name = get_cdn_domain($self, $ds_id); + my $deliveryservice_regexes = get_regexp_set($self, $ds_id); my $rs_ds = $self->db->resultset('Deliveryservice')->search( { 'me.xml_id' => $xml_id }, { prefetch => [ { 'type' => undef }, { 'profile' => undef } ] } ); my $data = $rs_ds->single;
[2/2] incubator-trafficcontrol git commit: This closes #307.
This closes #307. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/06b56aea Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/06b56aea Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/06b56aea Branch: refs/heads/master Commit: 06b56aeae5ce3afb03776c94aa95c0e69f064dfb Parents: 40af705 Author: Dan KirkwoodAuthored: Fri Feb 24 11:42:22 2017 -0700 Committer: Dan Kirkwood Committed: Fri Feb 24 11:42:22 2017 -0700 -- --
[2/2] incubator-trafficcontrol git commit: This closes #305.
This closes #305. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/f790c639 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/f790c639 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/f790c639 Branch: refs/heads/master Commit: f790c639d6b9b7f2251dc32e71d5c8bc3f9a4400 Parents: a32b506 Author: Dan KirkwoodAuthored: Fri Feb 24 12:59:29 2017 -0700 Committer: Dan Kirkwood Committed: Fri Feb 24 12:59:29 2017 -0700 -- --
[1/2] incubator-trafficcontrol git commit: removes non-implemented api docs route
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 06b56aeae -> f790c639d removes non-implemented api docs route Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a32b506a Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a32b506a Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a32b506a Branch: refs/heads/master Commit: a32b506ac8ce2b0d6555c05fc653ca887490b7f8 Parents: 06b56ae Author: Jeremy MitchellAuthored: Thu Feb 23 21:21:51 2017 -0700 Committer: Dan Kirkwood Committed: Fri Feb 24 12:55:38 2017 -0700 -- traffic_ops/app/lib/API/ApiDocs.pm | 31 traffic_ops/app/lib/TrafficOpsRoutes.pm | 3 --- 2 files changed, 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a32b506a/traffic_ops/app/lib/API/ApiDocs.pm -- diff --git a/traffic_ops/app/lib/API/ApiDocs.pm b/traffic_ops/app/lib/API/ApiDocs.pm deleted file mode 100644 index 927c29a..000 --- a/traffic_ops/app/lib/API/ApiDocs.pm +++ /dev/null @@ -1,31 +0,0 @@ -package API::ApiDocs; -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -# - -use UI::Utils; -use Mojo::Base 'Mojolicious::Controller'; -use MojoPlugins::Response; - -sub index { - - # I would like this to read and output the json found in templates/api_docs/v1.1.json - my $self = shift; - my $data = { foo => 'bar' }; - $self->success($data); -} - -1; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a32b506a/traffic_ops/app/lib/TrafficOpsRoutes.pm -- diff --git a/traffic_ops/app/lib/TrafficOpsRoutes.pm b/traffic_ops/app/lib/TrafficOpsRoutes.pm index 2d61e58..e1fae2e 100644 --- a/traffic_ops/app/lib/TrafficOpsRoutes.pm +++ b/traffic_ops/app/lib/TrafficOpsRoutes.pm @@ -376,9 +376,6 @@ sub api_routes { my $version = shift; my $namespace = shift; - # -- API DOCS - $r->get("/api/$version/docs")->to( 'ApiDocs#index', namespace => $namespace ); - # -- ASNS (CRANS) $r->get("/api/1.1/asns")->over( authenticated => 1 )->to( 'Asn#v11_index', namespace => $namespace ); $r->get("/api/1.2/asns")->over( authenticated => 1 )->to( 'Asn#index', namespace => $namespace );
[2/2] incubator-trafficcontrol git commit: This closes #306.
This closes #306. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/41212e27 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/41212e27 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/41212e27 Branch: refs/heads/master Commit: 41212e278a20db49a33dbbf9045e31beee61605d Parents: 7d6af75 Author: Dan KirkwoodAuthored: Fri Feb 24 14:30:58 2017 -0700 Committer: Dan Kirkwood Committed: Fri Feb 24 14:30:58 2017 -0700 -- --
[1/2] incubator-trafficcontrol git commit: exampleUrls is needed for this view so you're gonna have to call /api/version/deliveryservices/:id
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master f790c639d -> 41212e278 exampleUrls is needed for this view so you're gonna have to call /api/version/deliveryservices/:id Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7d6af759 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7d6af759 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7d6af759 Branch: refs/heads/master Commit: 7d6af759d82506e1d22514d620e59165b6de74e4 Parents: f790c63 Author: Jeremy MitchellAuthored: Fri Feb 24 08:14:34 2017 -0700 Committer: Dan Kirkwood Committed: Fri Feb 24 14:30:38 2017 -0700 -- .../deliveryServices/DashboardDeliveryServicesController.js | 4 ++-- .../view/overview/DeliveryServiceViewOverviewController.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7d6af759/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js -- diff --git a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js b/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js index 619b8ef..73debf6 100644 --- a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js +++ b/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js @@ -141,8 +141,8 @@ var DashboardDeliveryServicesController = function($window, $rootScope, $scope, size: 'lg', windowClass: 'ds-config-modal', resolve: { -deliveryService: function () { -return angular.copy(ds); +deliveryService: function (deliveryServiceService) { +return deliveryServiceService.getDeliveryService(ds.id); } } }); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7d6af759/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js -- diff --git a/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js b/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js index e359557..9902340 100644 --- a/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js +++ b/traffic_portal/app/src/modules/private/deliveryService/view/overview/DeliveryServiceViewOverviewController.js @@ -46,7 +46,7 @@ var DeliveryServiceViewOverviewController = function($scope, $location, $state, windowClass: 'ds-config-modal', resolve: { deliveryService: function () { -return angular.copy(ds); +return deliveryServiceService.getDeliveryService(ds.id); } } });
[19/50] [abbrv] incubator-trafficcontrol git commit: remove unused third-party files
remove unused third-party files (cherry picked from commit fa1d8eec50377f66a1f0847f2b10eb91c0940e8b) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/03af4a28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/03af4a28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/03af4a28 Branch: refs/heads/1.8.x Commit: 03af4a2837e84af319d6970168e520d7a48f8fe2 Parents: a7c882e Author: Dan KirkwoodAuthored: Mon Jan 23 12:51:09 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:42:27 2017 -0700 -- .../_themes/sphinx_rtd_theme/layout_old.html| 205 -- .../src/main/webapp/css/jMenu.jquery.css| 102 --- traffic_ops/app/public/js/lz-string-1.3.3.js| 684 --- 3 files changed, 991 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/03af4a28/docs/source/_themes/sphinx_rtd_theme/layout_old.html -- diff --git a/docs/source/_themes/sphinx_rtd_theme/layout_old.html b/docs/source/_themes/sphinx_rtd_theme/layout_old.html deleted file mode 100644 index deb8df2..000 --- a/docs/source/_themes/sphinx_rtd_theme/layout_old.html +++ /dev/null @@ -1,205 +0,0 @@ -{# -basic/layout.html -~ - -Master layout template for Sphinx themes. - -:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. -:license: BSD, see LICENSE for details. -#} -{%- block doctype -%} -http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> -{%- endblock %} -{%- set reldelim1 = reldelim1 is not defined and ' ' or reldelim1 %} -{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %} -{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and - (sidebars != []) %} -{%- set url_root = pathto('', 1) %} -{# XXX necessary? #} -{%- if url_root == '#' %}{% set url_root = '' %}{% endif %} -{%- if not embedded and docstitle %} - {%- set titlesuffix = " "|safe + docstitle|e %} -{%- else %} - {%- set titlesuffix = "" %} -{%- endif %} - -{%- macro relbar() %} - - {{ _('Navigation') }} - -{%- for rellink in rellinks %} - - {{ rellink[3] }} - {%- if not loop.first %}{{ reldelim2 }}{% endif %} -{%- endfor %} -{%- block rootrellink %} -{{ shorttitle|e }}{{ reldelim1 }} -{%- endblock %} -{%- for parent in parents %} - {{ parent.title }}{{ reldelim1 }} -{%- endfor %} -{%- block relbaritems %} {% endblock %} - - -{%- endmacro %} - -{%- macro sidebar() %} - {%- if render_sidebar %} - - - {%- block sidebarlogo %} - {%- if logo %} - - - - {%- endif %} - {%- endblock %} - {%- if sidebars != None %} -{#- new style sidebar: explicitly include/exclude templates #} -{%- for sidebartemplate in sidebars %} -{%- include sidebartemplate %} -{%- endfor %} - {%- else %} -{#- old style sidebars: using blocks -- should be deprecated #} -{%- block sidebartoc %} -{%- include "localtoc.html" %} -{%- endblock %} -{%- block sidebarrel %} -{%- include "relations.html" %} -{%- endblock %} -{%- block sidebarsourcelink %} -{%- include "sourcelink.html" %} -{%- endblock %} -{%- if customsidebar %} -{%- include customsidebar %} -{%- endif %} -{%- block sidebarsearch %} -{%- include "searchbox.html" %} -{%- endblock %} - {%- endif %} - - - {%- endif %} -{%- endmacro %} - -{%- macro script() %} - - var DOCUMENTATION_OPTIONS = { -URL_ROOT:'{{ url_root }}', -VERSION: '{{ release|e }}', -COLLAPSE_INDEX: false, -FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}', -HAS_SOURCE: {{ has_source|lower }} - }; - -{%- for scriptfile in script_files %} - -{%- endfor %} -{%- endmacro %} - -{%- macro css() %} - - -{%- for cssfile in css_files %} - -{%- endfor %} -{%- endmacro %} - -http://www.w3.org/1999/xhtml;> - - -{{ metatags }} -{%- block htmltitle %} -{{ title|striptags|e }}{{ titlesuffix }} -{%- endblock %} -{{ css() }} -{%- if not embedded %} -{{ script() }} -{%- if use_opensearch %} - -{%- endif %} -{%- if favicon %} - -{%- endif %} -{%- endif %} -{%- block linktags %} -
[17/50] [abbrv] incubator-trafficcontrol git commit: removes unused font files
removes unused font files (cherry picked from commit 8f06ab8b4a20972ea1cb13c09a16b934b7250398) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/42b9fc62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/42b9fc62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/42b9fc62 Branch: refs/heads/1.8.x Commit: 42b9fc62241cb4129b155ce2c8453f10fe8eda4a Parents: 3c7cc7d Author: Dan KirkwoodAuthored: Mon Jan 23 10:56:49 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:40:41 2017 -0700 -- .../static/fonts/fontawesome-webfont.svg| 414 .../src/assets/fonts/fontawesome-webfont.svg| 655 --- 2 files changed, 1069 deletions(-) --
[41/50] [abbrv] incubator-trafficcontrol git commit: Removed a file that merely uses jmenu from the list of jmenu-licensed things.
Removed a file that merely uses jmenu from the list of jmenu-licensed things. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/44661dfb Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/44661dfb Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/44661dfb Branch: refs/heads/1.8.x Commit: 44661dfb80276498ac03448215d201e387b19bd6 Parents: 2a6b29e Author: Chris LemmonsAuthored: Tue Jan 24 15:37:39 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 15:52:05 2017 -0700 -- LICENSE | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/44661dfb/LICENSE -- diff --git a/LICENSE b/LICENSE index 10048a3..afe013f 100644 --- a/LICENSE +++ b/LICENSE @@ -296,7 +296,6 @@ http://jquery.org/license For the jMenu component: @traffic_ops/app/public/*/jMenu.* @traffic_ops/app/public/*/jmenu.* -@traffic_ops/app/templates/jmenu.html.ep / *
[28/50] [abbrv] incubator-trafficcontrol git commit: Added links to the files themselves to the LICENSE.
Added links to the files themselves to the LICENSE. This lets readers know where the components are located and is machine readable so as to allow grepping the license file for dependencies. (cherry picked from commit c8a983ef2d0d928b03c6eae26cde35fe905f04ba) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9e6a59b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9e6a59b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9e6a59b6 Branch: refs/heads/1.8.x Commit: 9e6a59b636892aa9cd3b5a9e16f23e8b35eb47fc Parents: 5bffaa5 Author: Chris LemmonsAuthored: Tue Jan 24 09:22:46 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:44:34 2017 -0700 -- LICENSE | 35 +++ 1 file changed, 31 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9e6a59b6/LICENSE -- diff --git a/LICENSE b/LICENSE index 17744d9..8568f37 100644 --- a/LICENSE +++ b/LICENSE @@ -202,25 +202,30 @@ limitations under the License. -APACHE TRAFFICCONTROL SUBCOMPONENTS: +APACHE TRAFFICCONTROL SUBCOMPONENTS: Apache TrafficControl includes a number of subcomponents with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and -conditions of the following licenses. +conditions of the following licenses. For the sphinx_rtd_theme component: +@docs/source/_themes/sphinx_rtd_theme/* The MIT License (MIT): https://github.com/snide/sphinx_rtd_theme/blob/master/LICENSE Copyright (c) 2013 Dave Snider For the sphinx_rtd_theme/search.html component: +@docs/source/_themes/sphinx_rtd_theme/search.html :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. For the fontawesome component: +@docs/source/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf +@docs/source/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.* + /* * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome @@ -228,6 +233,7 @@ For the fontawesome component: */ For the bootstrap component: +@misc/traffic-control-cdn/css/bootstrap* /*! * Bootstrap v3.2.0 (http://getbootstrap.com) @@ -238,6 +244,7 @@ For the bootstrap component: /*! normalize.css v3.0.1 | MIT License | git.io/normalize */ For the sorttable component: +@traffic_monitor/experimental/traffic_monitor/static/sorttable.js /* SortTable @@ -267,6 +274,7 @@ For the jQuery component: */ For the jQuery UI component: +@traffic_ops/app/public/css/jquery-ui.structure.css jQuery UI CSS Framework 1.11.2 http://jqueryui.com @@ -278,6 +286,9 @@ http://jquery.org/license For the jMenu component: +@traffic_ops/app/public/*/jMenu.* +@traffic_ops/app/public/*/jmenu.* +@traffic_ops/app/templates/jmenu.html.ep / * @@ -292,6 +303,10 @@ For the jMenu component: */ For the DataTables component: +@traffic_ops/app/public/js/jquery.dataTables.js +@traffic_ops/experimental/ui/app/src/assets/css/jquery.dataTables.min.css +@traffic_ops/experimental/ui/app/src/assets/js/dataTables.tableTools.js +@traffic_ops/experimental/ui/app/src/assets/js/jquery.dataTables.min.js /** * @summary DataTables @@ -309,16 +324,18 @@ For the DataTables component: */ For the ng-map component: +@traffic_ops/experimental/ui/app/src/assets/js/ng-map_1.17.6.min.js /** * AngularJS Google Maps Ver. 1.17.3 * * The MIT License (MIT) - * + * * Copyright (c) 2014, 2015, 1016 Allen Kim */ For the underscore component: +@traffic_ops/experimental/ui/app/src/assets/js/underscore-min_1.8.3.js // Underscore.js 1.8.3 // http://underscorejs.org @@ -326,12 +343,14 @@ For the underscore component: // Underscore may be freely distributed under the MIT license. For the selenium component: +@infrastructure/test/ui/vendor/github.com/tebeka/selenium/* Copyright (c) 2012-2016 The Selenium Go Client Authors. This project is licensed under the MIT license. For the gmx component: +@traffic_monitor/experimental/vendor/github.com/davecheney/gmx/* Copyright (c) 2012, David Cheney All rights reserved. @@ -339,6 +358,7 @@ All rights reserved. ./traffic_monitor/experimental/vendor/github.com/davecheney/gmx/LICENCE For the stoppableListener component:
[27/50] [abbrv] incubator-trafficcontrol git commit: remove deleted file matches from .rat-excludes
remove deleted file matches from .rat-excludes (cherry picked from commit 293755cc4dc7c6b75cae2a46e6de351f01e057a1) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5bffaa54 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5bffaa54 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5bffaa54 Branch: refs/heads/1.8.x Commit: 5bffaa546b8d012bc00f87c7738fa1b492c46b6d Parents: 08bdf1d Author: Dan KirkwoodAuthored: Mon Jan 23 16:02:09 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:44:32 2017 -0700 -- .rat-excludes | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5bffaa54/.rat-excludes -- diff --git a/.rat-excludes b/.rat-excludes index 319ef8e..7e16f2c 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -36,8 +36,10 @@ j[mM]enu(?:\.jquery)?\.(?:css|js)(?: MIT. Properly documented in LICENSE ){0} .*underscore.*(?:MIT. Properly documented in LICENSE ){0} NetPacket(?: MIT. Properly documented in LICENSE ){0} dataTables\.tableTools\.js(?:MIT. Properly documented in LICENSE ){0} -handlebars\.js(?:MIT. Properly documented in LICENSE ){0} .*[fF]ont[aA]wesome.*(?: SIL OFL. Properly documented in LICENSE ){0} 01-gofmt(?: Go BSD. Properly documented in LICENSE ){0} GeoLite2-City\.mmdb\.gz(?: CC-SA 4.0. Properly documented in LICENSE ){0} ssl-bundle\.crt(?: MPL. Properly documented in LICENSE ){0} +sorttable\.js(?: X11. Properly documented in LICENSE ){0} +select2\..*(?: MIT. Properly documented in LICENSE ){0} +prettyprint\.js(?: BSD 2-clause. Properly documented in LICENSE ){0}
[01/50] [abbrv] incubator-trafficcontrol git commit: Added license header for load-test.jsx. [Forced Update!]
Repository: incubator-trafficcontrol Updated Branches: refs/heads/1.8.x 231e57bbd -> 14ef03fd2 (forced update) Added license header for load-test.jsx. (cherry picked from commit e8021a247370cbfabe8c415ed69e0910ef1cebf1) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9cfbf920 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9cfbf920 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9cfbf920 Branch: refs/heads/1.8.x Commit: 9cfbf9209bb66300ce9fceca27aa155bde08592b Parents: 1d9d13f Author: Chris LemmonsAuthored: Thu Jan 12 15:11:23 2017 -0700 Committer: Dan Kirkwood Committed: Fri Jan 13 11:46:09 2017 -0700 -- test/router/js/load-test.jsx | 13 + 1 file changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9cfbf920/test/router/js/load-test.jsx -- diff --git a/test/router/js/load-test.jsx b/test/router/js/load-test.jsx index abee17a..05cc3d2 100644 --- a/test/router/js/load-test.jsx +++ b/test/router/js/load-test.jsx @@ -1,3 +1,16 @@ +{/* + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/} if ( ! Array.prototype.groupBy) { Array.prototype.groupBy = function (f)
[35/50] [abbrv] incubator-trafficcontrol git commit: removes self-signed certs provided for convenience from TO UI experimental
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8c8b6b53/traffic_ops/experimental/ui/ssl/tls/certs/ssl-bundle.crt -- diff --git a/traffic_ops/experimental/ui/ssl/tls/certs/ssl-bundle.crt b/traffic_ops/experimental/ui/ssl/tls/certs/ssl-bundle.crt deleted file mode 100644 index 7b78dfc..000 --- a/traffic_ops/experimental/ui/ssl/tls/certs/ssl-bundle.crt +++ /dev/null @@ -1,10205 +0,0 @@ -# This is a bundle of X.509 certificates of public Certificate -# Authorities. It was generated from the Mozilla root CA list. -# -# Source: mozilla/security/nss/lib/ckfw/builtins/certdata.txt -# -# Generated from: -# $RCSfile: certdata.txt,v $ -# $Revision: 1.63 $ -# $Date: 2010/04/03 18:58:17 $ -# -Certificate: -Data: -Version: 3 (0x2) -Serial Number: -61:8d:c7:86:3b:01:82:05 -Signature Algorithm: sha1WithRSAEncryption -Issuer: CN=ACEDICOM Root, OU=PKI, O=EDICOM, C=ES -Validity -Not Before: Apr 18 16:24:22 2008 GMT -Not After : Apr 13 16:24:22 2028 GMT -Subject: CN=ACEDICOM Root, OU=PKI, O=EDICOM, C=ES -Subject Public Key Info: -Public Key Algorithm: rsaEncryption -Public-Key: (4096 bit) -Modulus: -00:ff:92:95:e1:68:06:76:b4:2c:c8:58:48:ca:fd: -80:54:29:55:63:24:ff:90:65:9b:10:75:7b:c3:6a: -db:62:02:01:f2:18:86:b5:7c:5a:38:b1:e4:58:b9: -fb:d3:d8:2d:9f:bd:32:37:bf:2c:15:6d:be:b5:f4: -21:d2:13:91:d9:07:ad:01:05:d6:f3:bd:77:ce:5f: -42:81:0a:f9:6a:e3:83:00:a8:2b:2e:55:13:63:81: -ca:47:1c:7b:5c:16:57:7a:1b:83:60:04:3a:3e:65: -c3:cd:01:de:de:a4:d6:0c:ba:8e:de:d9:04:ee:17: -56:22:9b:8f:63:fd:4d:16:0b:b7:7b:77:8c:f9:25: -b5:d1:6d:99:12:2e:4f:1a:b8:e6:ea:04:92:ae:3d: -11:b9:51:42:3d:87:b0:31:85:af:79:5a:9c:fe:e7: -4e:5e:92:4f:43:fc:ab:3a:ad:a5:12:26:66:b9:e2: -0c:d7:98:ce:d4:58:a5:95:40:0a:b7:44:9d:13:74: -2b:c2:a5:eb:22:15:98:10:d8:8b:c5:04:9f:1d:8f: -60:e5:06:1b:9b:cf:b9:79:a0:3d:a2:23:3f:42:3f: -6b:fa:1c:03:7b:30:8d:ce:6c:c0:bf:e6:1b:5f:bf: -67:b8:84:19:d5:15:ef:7b:cb:90:36:31:62:c9:bc: -02:ab:46:5f:9b:fe:1a:68:94:34:3d:90:8e:ad:f6: -e4:1d:09:7f:4a:88:38:3f:be:67:fd:34:96:f5:1d: -bc:30:74:cb:38:ee:d5:6c:ab:d4:fc:f4:00:b7:00: -5b:85:32:16:76:33:e9:d8:a3:99:9d:05:00:aa:16: -e6:f3:81:7d:6f:7d:aa:86:6d:ad:15:74:d3:c4:a2: -71:aa:f4:14:7d:e7:32:b8:1f:bc:d5:f1:4e:bd:6f: -17:02:39:d7:0e:95:42:3a:c7:00:3e:e9:26:63:11: -ea:0b:d1:4a:ff:18:9d:b2:d7:7b:2f:3a:d9:96:fb: -e8:1e:92:ae:13:55:c8:d9:27:f6:dc:48:1b:b0:24: -c1:85:e3:77:9d:9a:a4:f3:0c:11:1d:0d:c8:b4:14: -ee:b5:82:57:09:bf:20:58:7f:2f:22:23:d8:70:cb: -79:6c:c9:4b:f2:a9:2a:c8:fc:87:2b:d7:1a:50:f8: -27:e8:2f:43:e3:3a:bd:d8:57:71:fd:ce:a6:52:5b: -f9:dd:4d:ed:e5:f6:6f:89:ed:bb:93:9c:76:21:75: -f0:92:4c:29:f7:2f:9c:01:2e:fe:50:46:9e:64:0c: -14:b3:07:5b:c5:c2:73:6c:f1:07:5c:45:24:14:35: -ae:83:f1:6a:4d:89:7a:fa:b3:d8:2d:66:f0:36:87: -f5:2b:53 -Exponent: 65537 (0x10001) -X509v3 extensions: -X509v3 Basic Constraints: critical -CA:TRUE -X509v3 Authority Key Identifier: - keyid:A6:B3:E1:2B:2B:49:B6:D7:73:A1:AA:94:F5:01:E7:73:65:4C:AC:50 - -X509v3 Key Usage: critical -Digital Signature, Certificate Sign, CRL Sign -X509v3 Subject Key Identifier: -A6:B3:E1:2B:2B:49:B6:D7:73:A1:AA:94:F5:01:E7:73:65:4C:AC:50 -X509v3 Certificate Policies: -Policy: X509v3 Any Policy - CPS: http://acedicom.edicomgroup.com/doc - -Signature Algorithm: sha1WithRSAEncryption -ce:2c:0b:52:51:62:26:7d:0c:27:83:8f:c5:f6:da:a0:68:7b: -4f:92:5e:ea:a4:73:32:11:53:44:b2:44:cb:9d:ec:0f:79:42: -b3:10:a6:c7:0d:9d:cb:b6:fa:3f:3a:7c:ea:bf:88:53:1b:3c: -f7:82:fa:05:35:33:e1:35:a8:57:c0:e7:fd:8d:4f:3f:93:32: -4f:78:66:03:77:07:58:e9:95:c8:7e:3e:d0:79:00:8c:f2:1b: -51:33:9b:bc:94:e9:3a:7b:6e:52:2d:32:9e:23:a4:45:fb:b6: -2e:13:b0:8b:18:b1:dd:ce:d5:1d:a7:42:7f:55:be:fb:5b:bb: -47:d4:fc:24:cd:04:ae:96:05:15:d6:ac:ce:30:f3:ca:0b:c5: -ba:e2:22:e0:a6:ad:22:e4:02:ee:74:11:7f:4c:ff:78:1d:35: -da:e6:02:34:eb:18:12:61:77:06:09:16:63:ea:18:ad:a2:87: -
[08/50] [abbrv] incubator-trafficcontrol git commit: removes percentagebar from to graph page due to incompatible license
removes percentagebar from to graph page due to incompatible license (cherry picked from commit 2ba6ebd0519977dac648a1e6750834f6c408c527) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/597e7795 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/597e7795 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/597e7795 Branch: refs/heads/1.8.x Commit: 597e7795c48ab65fe57175642973481b9dc020e6 Parents: 7e5db8d Author: Jeremy MitchellAuthored: Thu Jan 12 15:41:11 2017 -0700 Committer: Dan Kirkwood Committed: Fri Jan 13 12:10:32 2017 -0700 -- traffic_ops/app/public/js/percentagebar.js | 100 --- .../app/templates/visual_status/graphs.html.ep | 27 + 2 files changed, 2 insertions(+), 125 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/597e7795/traffic_ops/app/public/js/percentagebar.js -- diff --git a/traffic_ops/app/public/js/percentagebar.js b/traffic_ops/app/public/js/percentagebar.js deleted file mode 100644 index 88a667e..000 --- a/traffic_ops/app/public/js/percentagebar.js +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -// From http://www.webappers.com/progressBar/lib/progress.js -// use: -// display('<%= $short %>_percent_indicator',0,1);< -// update: -// setProgress(cdn + "_percent_indicator", Math.round(lastVal/maxGbps[cdn] * 100)); - -/* WebAppers Progress Bar, version 0.2 -* (c) 2007 Ray Cheung -* -* WebAppers Progress Bar is freely distributable under the terms of an Creative Commons license. -* For details, see the WebAppers web site: http://.Webappers.com/ -* -/*--*/ -var initial = -120; -var imageWidth=240; -var eachPercent = (imageWidth/2)/100; - -function percentLabel( id, percentage ) -{ -document.write(''+percentage+'%'); -} - -function progressBar( id, percentage ) -{ - document.write(''); -} - - -function setText (id, percent) -{ -$('#' + id +'Text')[0].innerHTML = percent+"%"; -} - -function setProgress(id, percentage) -{ -if (isNaN(percentage) || !isFinite(percentage)){ - percentage = 0; - } -var percentageWidth = eachPercent * percentage; -var pb = $('#' + id); - /* Sample Colors - var green = '#A4E142'; - var yellow = '#D5E043'; - var red = '#E05043'; - */ - - /* Mark T's colors*/ - var green = '#76AA5E'; - var yellow = '#C07818'; - var red = '#6D1E05'; - var color = green; - var backgroundColor = '#ccc'; - if (percentage = 0) { - color = backgroundColor; - } else if ((percentage > 50) && (percentage < 75)) { - color = yellow; - } else if ((percentage > 75) && (percentage <=100)) { - color = red; - } else { - color = green; - } - -pb.progressbar({ -value: percentageWidth, -}); -pb.css({ - "background": backgroundColor -}); - var pbValue = pb.find( ".ui-progressbar-value" ); - pbValue.css({ - "background": color - }); - //#A4E142 - Green - //#D5E043 - Yellow - //#E05043 - Red -var newProgress = eval(initial)+eval(percentageWidth)+'px'; -$('#' + id)[0].style.backgroundPosition=newProgress+' 0'; -setText(id,percentage); -} - -/*--*/ http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/597e7795/traffic_ops/app/templates/visual_status/graphs.html.ep -- diff --git a/traffic_ops/app/templates/visual_status/graphs.html.ep b/traffic_ops/app/templates/visual_status/graphs.html.ep index 551a8c1..30bdbb8 100644 ---
[11/50] [abbrv] incubator-trafficcontrol git commit: adds license details for experimental TO ui theme and loading bar used in traffic portal and experimental TO UI
adds license details for experimental TO ui theme and loading bar used in traffic portal and experimental TO UI (cherry picked from commit 57068b4ce64e32a5374417fcab774f0e5d97f6eb) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/44ce8a4e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/44ce8a4e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/44ce8a4e Branch: refs/heads/1.8.x Commit: 44ce8a4eb67ae439c679bd686515d6305c13fea4 Parents: 597e779 Author: Jeremy MitchellAuthored: Tue Jan 24 11:15:41 2017 -0700 Committer: Dan Kirkwood Committed: Tue Jan 24 11:40:38 2017 -0700 -- traffic_ops/experimental/ui/app/src/index.html |2 + .../experimental/ui/app/src/styles/loading.scss | 110 + .../experimental/ui/app/src/styles/main.scss| 5954 +- .../experimental/ui/app/src/styles/theme.scss | 4174 traffic_portal/app/src/index.html |1 + traffic_portal/app/src/styles/loading.scss | 110 + traffic_portal/app/src/styles/main.scss | 113 - 7 files changed, 4406 insertions(+), 6058 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/44ce8a4e/traffic_ops/experimental/ui/app/src/index.html -- diff --git a/traffic_ops/experimental/ui/app/src/index.html b/traffic_ops/experimental/ui/app/src/index.html index ee95434..ac22f1d 100644 --- a/traffic_ops/experimental/ui/app/src/index.html +++ b/traffic_ops/experimental/ui/app/src/index.html @@ -30,6 +30,8 @@ under the License. + + http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/44ce8a4e/traffic_ops/experimental/ui/app/src/styles/loading.scss -- diff --git a/traffic_ops/experimental/ui/app/src/styles/loading.scss b/traffic_ops/experimental/ui/app/src/styles/loading.scss new file mode 100644 index 000..eef92fe --- /dev/null +++ b/traffic_ops/experimental/ui/app/src/styles/loading.scss @@ -0,0 +1,110 @@ +/*! + * angular-loading-bar v0.4.2 + * https://chieffancypants.github.io/angular-loading-bar + * Copyright (c) 2014 Wes Cruver + * License: MIT + */ + +/* Make clicks pass-through */ +#loading-bar, +#loading-bar-spinner { + pointer-events: none; + -webkit-pointer-events: none; + -webkit-transition: 350ms linear all; + -moz-transition: 350ms linear all; + -o-transition: 350ms linear all; + transition: 350ms linear all; +} + +#loading-bar.ng-enter, +#loading-bar.ng-leave.ng-leave-active, +#loading-bar-spinner.ng-enter, +#loading-bar-spinner.ng-leave.ng-leave-active { + opacity: 0; +} + +#loading-bar.ng-enter.ng-enter-active, +#loading-bar.ng-leave, +#loading-bar-spinner.ng-enter.ng-enter-active, +#loading-bar-spinner.ng-leave { + opacity: 1; +} + +#loading-bar .bar { + -webkit-transition: width 350ms; + -moz-transition: width 350ms; + -o-transition: width 350ms; + transition: width 350ms; + + background: #29d; + position: fixed; + z-index: 2000; + top: 0; + left: 0; + width: 100%; + height: 2px; + border-bottom-right-radius: 1px; + border-top-right-radius: 1px; +} + +/* Fancy blur effect */ +#loading-bar .peg { + position: absolute; + width: 70px; + right: 0; + top: 0; + height: 2px; + opacity: .45; + -moz-box-shadow: #29d 1px 0 6px 1px; + -ms-box-shadow: #29d 1px 0 6px 1px; + -webkit-box-shadow: #29d 1px 0 6px 1px; + box-shadow: #29d 1px 0 6px 1px; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; + border-radius: 100%; +} + +#loading-bar-spinner { + display: none; + position: fixed; + z-index: 2000; + top: 10px; + left: 10px; +} + +#loading-bar-spinner .spinner-icon { + width: 14px; + height: 14px; + + border: solid 2px transparent; + border-top-color: #29d; + border-left-color: #29d; + border-radius: 10px; + + -webkit-animation: loading-bar-spinner 400ms linear infinite; + -moz-animation:loading-bar-spinner 400ms linear infinite; + -ms-animation: loading-bar-spinner 400ms linear infinite; + -o-animation: loading-bar-spinner 400ms linear infinite; + animation: loading-bar-spinner 400ms linear infinite; +} + +@-webkit-keyframes loading-bar-spinner { + 0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); } +} +@-moz-keyframes loading-bar-spinner { + 0% { -moz-transform: rotate(0deg); transform: rotate(0deg); } + 100% { -moz-transform: rotate(360deg); transform: rotate(360deg); } +} +@-o-keyframes loading-bar-spinner { + 0% { -o-transform: