trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mitchell...@apache.org
Subject [trafficcontrol] 07/46: Fixed minor issues
Date Wed, 26 Sep 2018 13:51:24 GMT
This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit bf7a456a49e1e70711de066b7a87c6c7131e2221
Author: ocket8888 <ocket8888@gmail.com>
AuthorDate: Tue Sep 11 09:37:12 2018 -0600

    Fixed minor issues
---
 docs/source/admin/traffic_ops/default_profiles.rst |  48 +--
 docs/source/admin/traffic_ops/installation.rst     | 362 +++++++++++----------
 2 files changed, 211 insertions(+), 199 deletions(-)

diff --git a/docs/source/admin/traffic_ops/default_profiles.rst b/docs/source/admin/traffic_ops/default_profiles.rst
index abf05cd..a7f98de 100644
--- a/docs/source/admin/traffic_ops/default_profiles.rst
+++ b/docs/source/admin/traffic_ops/default_profiles.rst
@@ -1,54 +1,56 @@
-.. 
-.. 
+..
+..
 .. 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.
-.. 
+..
 
 .. index::
-  Traffic Ops - Default Profiles
-  
+	Traffic Ops - Default Profiles
+
 .. _rl-to-default-profiles:
 
 Traffic Ops - Default Profiles
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-Traffic Ops has the concept of :ref:`rl-working-with-profiles`, which are an integral function
within Traffic Ops.  To get started, a set of default Traffic Ops profiles need to be imported
into Traffic Ops
-to get started to support Traffic Control components Traffic Router, Traffic Monitor, and
Apache Traffic Server.
+Traffic Ops has the concept of :ref:`rl-working-with-profiles`, which are an integral component
of Traffic Ops. To get started, a set of default Traffic Ops profiles are provided. These
can be imported into Traffic Ops, and are required by the Traffic Control components Traffic
Router, Traffic Monitor, and Apache Traffic Server (Edge-tier and Mid-tier caches).
 
-`Download Default Profiles from here <http://trafficcontrol.apache.org/downloads/profiles/>`_

+`Download Default Profiles from here <http://trafficcontrol.apache.org/downloads/profiles/>`_
 
 .. _rl-to-profiles-min-needed:
 
 Minimum Traffic Ops Profiles needed
 -----------------------------------
-   * EDGE_ATS_<version>_<platform>_PROFILE.traffic_ops
-   * MID_ATS_<version>_<platform>_PROFILE.traffic_ops
-   * TRAFFIC_MONITOR_PROFILE.traffic_ops
-   * TRAFFIC_ROUTER_PROFILE.traffic_ops
-   * TRAFFIC_STATS_PROFILE.traffic_ops
-   * EDGE_GROVE_PROFILE.traffic_ops
-   
 
+- EDGE_ATS_<version>_<platform>_PROFILE.traffic_ops
+- MID_ATS_<version>_<platform>_PROFILE.traffic_ops
+- TRAFFIC_MONITOR_PROFILE.traffic_ops
+- TRAFFIC_ROUTER_PROFILE.traffic_ops
+- TRAFFIC_STATS_PROFILE.traffic_ops
+- EDGE_GROVE_PROFILE.traffic_ops
+
+.. note:: Despite that these have the ``.traffic_ops`` extension, they use JSON to store
data. If your syntax highlighting doesn't work in some editor or viewer, try changing the
extension to ``.json``.
+
+.. warning:: These profiles will likely need to be modified to suit your system. Many of
them contain hardware-specific parameters and parameter values.
 
 Steps to Import a Profile
 -------------------------
-1. Sign into Traffic Ops
+#. Sign into Traffic Portal
 
-2. Navigate to 'Parameters->Select Profile'
+#. Under the 'Configure' menu, select 'Profiles'
 
-3. Click the "Import Profile" button at the bottom
+#. From the 'More' drop-down menu, click on 'Import Profile'
 
-4. Choose the specific profile you want to import from your download directory
+#. Drag and drop your desired profile into the upload pane
 
-5. Click 'Submit'
+#. Click 'Import'
 
-6. Continue these steps for each :ref:`rl-to-profiles-min-needed` above
+#. Continue these steps for each of the :ref:`rl-to-profiles-min-needed`.
diff --git a/docs/source/admin/traffic_ops/installation.rst b/docs/source/admin/traffic_ops/installation.rst
index d2eaec1..144aaa6 100644
--- a/docs/source/admin/traffic_ops/installation.rst
+++ b/docs/source/admin/traffic_ops/installation.rst
@@ -14,7 +14,7 @@
 ..
 
 .. index::
-  Traffic Ops - Installing
+	Traffic Ops - Installing
 
 .. _rl-to-install:
 
@@ -25,200 +25,212 @@ System Requirements
 -------------------
 The user must have the following for a successful minimal install:
 
-* CentOS 7
-* 2 VMs with at least 2 vCPUs, 4GB RAM, 20 GB disk space each
-* Access to Centos Base and epel repositories
-* Access to `The Comprehensive Perl Archive Network (CPAN) <http://www.cpan.org/>`_
+- CentOS 7+
+- 2 machines or Virtual Machines (VMs), each with at least 2 (v)CPUs, 4GB of RAM, and 20
GB of disk space.
+- Access to CentOS Base and EPEL repositories
+- Access to `The Comprehensive Perl Archive Network (CPAN) <http://www.cpan.org/>`_
 
-As of version 2.0 only Postgres is supported as the database. This documentation assumes
CentOS 7.2 and Postgresql 9.6.3 for a production install.
+As of version 2.0 only PostgreSQL is supported as the database. This documentation assumes
CentOS 7.2 and PostgreSQL 9.6.3 for a production install.
 
 .. highlight:: none
 
-Navigating the Install
------------------------
-To begin the install:
+Installation
+------------
 
-1. Install Postgres
+#. Install PostgreSQL Database
 
-  For a production install it is best to install postgres on it's own server/VM. To install
postgres, on the postgres host (pg) ::
+	.. note:: For more information on installing PostgreSQL, see `their documentation <https://www.postgresql.org/docs/>`_.
 
-    pg-$ sudo su -
-    pg-# yum -y update
-    pg-# yum -y install https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
-    pg-# yum -y install postgresql96-server
-    pg-$ su - postgres
-    pg-$ /usr/pgsql-9.6/bin/initdb -A md5 -W #-W forces the user to provide a superuser (postgres)
password
+	For a production install it is best to install PostgreSQL on its own server/VM. To install
PostgreSQL, on the PostgreSQL host (hostname ``pg`` in example),
+	run the following commands as the root user (or with ``sudo``) ::
 
+		yum update -y
+		yum install -y https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
+		yum install -y postgresql96-server
+		su - postgres -c /usr/pgsql-9.6/bin/initdb -A md5 -W #-W forces the user to provide a superuser
(postgres) password
 
-  Edit ``/var/lib/pgsql/9.6/data/pg_hba.conf`` to allow your traffic ops app server access.
For example if you are going to install traffic ops on ``99.33.99.1`` add::
 
-    host  all   all     99.33.99.1/32 md5
+	Edit ``/var/lib/pgsql/9.6/data/pg_hba.conf`` to allow your Traffic Ops instance to access
the PostgreSQL server. For example if you are going to install Traffic Ops on ``99.33.99.1``
add::
 
-  to the appropriate section of this file. Edit the ``/var/lib/pgsql/9.6/data/postgresql.conf``
file to add the approriate listen_addresses or ``listen_addresses = '*'``, set ``timezone
= 'UTC'``,  and start the database: ::
+		host  all   all     99.33.99.1/32 md5
 
-    pg-$ exit
-    pg-# systemctl enable postgresql-9.6
-    pg-# systemctl start postgresql-9.6
-    pg-# systemctl status postgresql-9.6
+	to the appropriate section of this file. Edit the ``/var/lib/pgsql/9.6/data/postgresql.conf``
file to add the appropriate listen_addresses or ``listen_addresses = '*'``, set ``timezone
= 'UTC'``, and start the database: ::
 
+		systemctl enable postgresql-9.6
+		systemctl start postgresql-9.6
+		systemctl status postgresql-9.6
 
-2. Build Traffic Ops
 
-   Build a Traffic Ops rpm using the instructions under the :ref:`dev-building` page.
+#. Build Traffic Ops
 
+	 Build a Traffic Ops ``.rpm`` file using the instructions under the :ref:`dev-building`
page.
 
-3. Install Postgresql
+#. Install PostgreSQL
 
-  Install the postgresql 9.6 yum repository access. ::
+	To install the PostgreSQL 9.6 yum repository, run this command as the root user (or with
``sudo``) ::
 
-    to-$ sudo su -
-    to-# yum -y install https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
+		yum install -y https://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm
 
-4. Install the rpm built in step 2. ::
+#. Install the Traffic Ops RPM
 
-    to-# yum -y install ./dist/traffic_ops-2.0.0-xxxx.yyyyyyy.el7.x86_64.rpm
+	.. note:: This will install the PostgreSQL client, ``psql`` as a dependency.
 
+	The Traffic Ops RPM file should have been built in an earlier step. To install it, simply
run the following command as the root user (or with ``sudo``): ::
 
-  Install some additional packages that it depends on that were not installed as dependecies
in the previous step (these are for the 2.0.0 install, this may change, but the pre-installs
won't hurt): ::
+		yum install -y ./dist/traffic_ops-2.0.0-xxxx.yyyyyyy.el7.x86_64.rpm
 
-    to-# yum -y install git
-    to-# wget -q https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz
-    to-# tar -C /usr/local -xzf go1.8.3.linux-amd64.tar.gz
-    to-# PATH=$PATH:/usr/local/go/bin             # go bins are needed in the path for postinstall
-    to-# go get bitbucket.org/liamstask/goose/cmd/goose
 
-  At this point you should be able to login to the database from the ``to`` host to the ``pg``
host like: ::
+#. Install Additional Packages
 
-    to-# psql -h 99.33.99.1 -U postgres
-    Password for user postgres:
-    psql (9.6.3)
-    Type "help" for help.
+	.. note:: These are for the Traffic Control version 2.0.0 install, this may change, but
the explicit installs won't hurt.
 
-    postgres=#
+	Some packages on which Traffic Ops depends not have been installed as direct dependencies
of the ``traffic_ops-<version stuff>.rpm``. To explicitly install these,
+	run the following commands as the root user (or with ``sudo``): ::
 
-  Use this connectivity to create the user and database. In  this example, we use user: ``traffic_ops``,
password: ``tcr0cks``, database: ``traffic_ops``: ::
+		yum install -y git
+		wget -q https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz -O go.tar.gz
+		tar -C /usr/local -xzf go.tar.gz
+		PATH=$PATH:/usr/local/go/bin                    # go binaries are needed in the path for
the 'postinstall' script
+		go get bitbucket.org/liamstask/goose/cmd/goose
 
-    to-# psql -U postgres -h 99.33.99.1 -c "CREATE USER traffic_ops  WITH ENCRYPTED PASSWORD
'tcr0cks';"
-    Password for user postgres:
-    CREATE ROLE
-    to-# createdb traffic_ops --owner traffic_ops -U postgres -h 99.33.99.1
-    Password:
-    to-#
-
-
-  Now, run the following command as root: ``/opt/traffic_ops/install/bin/postinstall``
-
-  The postinstall will first get all packages needed from CPAN. This may take a while, expect
up to 30 minutes on the first install.
-  If there are any prompts in this phase, please just answer with the defaults (some CPAN
installs can prompt for install questions).
-
-  When this phase is complete, you will see::
-
-      Complete! Modules were installed into /opt/traffic_ops/app/local
-
-  Some additional files will be installed, and then it will proceed with the next phase of
the install, where it will ask you about the local environment for your CDN. Please make sure
you remember all your answers and the database answers match the database information previously
used to create the database.
-
-
-  Example output::
-
-      ===========/opt/traffic_ops/app/conf/production/database.conf===========
-      Database type [Pg]:
-      Database type: Pg
-      Database name [traffic_ops]:
-      Database name: traffic_ops
-      Database server hostname IP or FQDN [localhost]: 99.33.99.1
-      Database server hostname IP or FQDN: 99.33.99.1
-      Database port number [5432]:
-      Database port number: 5432
-      Traffic Ops database user [traffic_ops]:
-      Traffic Ops database user: traffic_ops
-      Password for Traffic Ops database user:
-      Re-Enter Password for Traffic Ops database user:
-      Writing json to /opt/traffic_ops/app/conf/production/database.conf
-      Database configuration has been saved
-      ===========/opt/traffic_ops/app/db/dbconf.yml===========
-      Database server root (admin) user [postgres]:
-      Database server root (admin) user: postgres
-      Password for database server admin:
-      Re-Enter Password for database server admin:
-      Download Maxmind Database? [yes]:
-      Download Maxmind Database?: yes
-      ===========/opt/traffic_ops/app/conf/cdn.conf===========
-      Generate a new secret? [yes]:
-      Generate a new secret?: yes
-      Number of secrets to keep? [10]:
-      Number of secrets to keep?: 10
-      Not setting up ldap
-      ===========/opt/traffic_ops/install/data/json/users.json===========
-      Administration username for Traffic Ops [admin]:
-      Administration username for Traffic Ops: admin
-      Password for the admin user:
-      Re-Enter Password for the admin user:
-      Writing json to /opt/traffic_ops/install/data/json/users.json
-      ===========/opt/traffic_ops/install/data/json/openssl_configuration.json===========
-      Do you want to generate a certificate? [yes]:
-      Country Name (2 letter code): US
-      State or Province Name (full name): CO
-      Locality Name (eg, city): Denver
-      Organization Name (eg, company): Super CDN, Inc
-      Organizational Unit Name (eg, section):
-      Common Name (eg, your name or your server's hostname):
-      RSA Passphrase:
-      Re-Enter RSA Passphrase:
-      ===========/opt/traffic_ops/install/data/json/profiles.json===========
-      Traffic Ops url [https://localhost]:
-      Traffic Ops url: https://localhost
-      Human-readable CDN Name.  (No whitespace, please) [kabletown_cdn]: blue_cdn
-      Human-readable CDN Name.  (No whitespace, please): blue_cdn
-      DNS sub-domain for which your CDN is authoritative [cdn1.kabletown.net]: blue-cdn.supercdn.net
-      DNS sub-domain for which your CDN is authoritative: blue-cdn.supercdn.net
-      Writing json to /opt/traffic_ops/install/data/json/profiles.json
-      Downloading Maxmind data
-      --2017-06-11 15:32:41--  http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
-      Resolving geolite.maxmind.com (geolite.maxmind.com)... 2400:cb00:2048:1::6810:262f,
2400:cb00:2048:1::6810:252f, 104.16.38.47, ...
-      Connecting to geolite.maxmind.com (geolite.maxmind.com)|2400:cb00:2048:1::6810:262f|:80...
connected.
-
-      ... much SQL output skipped
-
-      Starting Traffic Ops
-      Restarting traffic_ops (via systemctl):                    [  OK  ]
-      Waiting for Traffic Ops to restart
-      Success! Postinstall complete.
-
-      to-# ifconfig
-
-
-  Explanation of the information that needs to be provided:
-
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Field                                              | Description                  
                                                               |
-    +====================================================+==============================================================================================+
-    | Database type                                      | Pg                           
                                                               |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Database name                                      | The name of the database Traffic
Ops uses to store the configuration information             |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Database server hostname IP or FQDN                | The hostname of the database server
                                                         |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Database port number                               | The database port number     
                                                               |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Traffic Ops database user                          | The username Traffic Ops will
use to read/write from the database                            |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Password for traffic ops                           | The password for the above database
user                                                     |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Database server root (admin) user name             | Privileged database user that
has permission to create the database and user for Traffic Ops |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Database server root (admin) user password         | The password for the above privileged
database user                                          |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Traffic Ops url                                    | The URL to connect to this instance
of Traffic Ops, usually https://<traffic ops host FQDN>/ |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Human-readable CDN Name                            | The name of the first CDN traffic
Ops will be managing                                       |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | DNS sub-domain for which your CDN is authoritative | The DNS domain that will be delegated
to this Traffic Control CDN                            |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Administration username for Traffic Ops            | The Administration (highest privilege)
Traffic Ops user to create;                           |
-    |                                                    | use this user to login for the
first time and create other users                             |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
-    | Password for the admin user                        | The password for the above user
                                                             |
-    +----------------------------------------------------+----------------------------------------------------------------------------------------------+
+
+#. Login to the Database from the Traffic Ops machine
+
+	At this point you should be able to login from the Traffic Ops (hostname ``to`` in the example)
host to the PostgreSQL (hostname ``pg`` in the example) host like so: ::
+
+		to-# psql -h 99.33.99.1 -U postgres
+		Password for user postgres:
+		psql (9.6.3)
+		Type "help" for help.
+
+		postgres=#
+
+
+#. Create the User and Database
+
+	In this example, we use user: ``traffic_ops``, password: ``tcr0cks``, database: ``traffic_ops``:
::
+
+		to-# psql -U postgres -h 99.33.99.1 -c "CREATE USER traffic_ops WITH ENCRYPTED PASSWORD
'tcr0cks';"
+		Password for user postgres:
+		CREATE ROLE
+		to-# createdb traffic_ops --owner traffic_ops -U postgres -h 99.33.99.1
+		Password:
+		to-#
+
+#. Run the ``postinstall`` Script
+
+	Now, run the following command as root: ``/opt/traffic_ops/install/bin/postinstall``
+
+	The ``postinstall`` script will first get all packages needed from CPAN. This may take a
while, expect up to 30 minutes on the first install.
+	If there are any prompts in this phase, please just answer with the defaults (some CPAN
installs can prompt for install questions).
+
+	When this phase is complete, you will see::
+
+		Complete! Modules were installed into /opt/traffic_ops/app/local
+
+	Some additional files will be installed, and then it will proceed with the next phase of
the install, where it will ask you about the local environment for your CDN. Please make sure
you remember all your answers and verify that the database answers match the information previously
used to create the database.
+
+	Example output::
+
+		===========/opt/traffic_ops/app/conf/production/database.conf===========
+		Database type [Pg]:
+		Database type: Pg
+		Database name [traffic_ops]:
+		Database name: traffic_ops
+		Database server hostname IP or FQDN [localhost]: 99.33.99.1
+		Database server hostname IP or FQDN: 99.33.99.1
+		Database port number [5432]:
+		Database port number: 5432
+		Traffic Ops database user [traffic_ops]:
+		Traffic Ops database user: traffic_ops
+		Password for Traffic Ops database user:
+		Re-Enter Password for Traffic Ops database user:
+		Writing json to /opt/traffic_ops/app/conf/production/database.conf
+		Database configuration has been saved
+		===========/opt/traffic_ops/app/db/dbconf.yml===========
+		Database server root (admin) user [postgres]:
+		Database server root (admin) user: postgres
+		Password for database server admin:
+		Re-Enter Password for database server admin:
+		Download Maxmind Database? [yes]:
+		Download Maxmind Database?: yes
+		===========/opt/traffic_ops/app/conf/cdn.conf===========
+		Generate a new secret? [yes]:
+		Generate a new secret?: yes
+		Number of secrets to keep? [10]:
+		Number of secrets to keep?: 10
+		Not setting up ldap
+		===========/opt/traffic_ops/install/data/json/users.json===========
+		Administration username for Traffic Ops [admin]:
+		Administration username for Traffic Ops: admin
+		Password for the admin user:
+		Re-Enter Password for the admin user:
+		Writing json to /opt/traffic_ops/install/data/json/users.json
+		===========/opt/traffic_ops/install/data/json/openssl_configuration.json===========
+		Do you want to generate a certificate? [yes]:
+		Country Name (2 letter code): US
+		State or Province Name (full name): CO
+		Locality Name (eg, city): Denver
+		Organization Name (eg, company): Super CDN, Inc
+		Organizational Unit Name (eg, section):
+		Common Name (eg, your name or your server's hostname):
+		RSA Passphrase:
+		Re-Enter RSA Passphrase:
+		===========/opt/traffic_ops/install/data/json/profiles.json===========
+		Traffic Ops url [https://localhost]:
+		Traffic Ops url: https://localhost
+		Human-readable CDN Name.  (No whitespace, please) [kabletown_cdn]: blue_cdn
+		Human-readable CDN Name.  (No whitespace, please): blue_cdn
+		DNS sub-domain for which your CDN is authoritative [cdn1.kabletown.net]: blue-cdn.supercdn.net
+		DNS sub-domain for which your CDN is authoritative: blue-cdn.supercdn.net
+		Writing json to /opt/traffic_ops/install/data/json/profiles.json
+		Downloading Maxmind data
+		--2017-06-11 15:32:41--  http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
+		Resolving geolite.maxmind.com (geolite.maxmind.com)... 2400:cb00:2048:1::6810:262f, 2400:cb00:2048:1::6810:252f,
104.16.38.47, ...
+		Connecting to geolite.maxmind.com (geolite.maxmind.com)|2400:cb00:2048:1::6810:262f|:80...
connected.
+
+		... much SQL output skipped
+
+		Starting Traffic Ops
+		Restarting traffic_ops (via systemctl):                    [  OK  ]
+		Waiting for Traffic Ops to restart
+		Success! Postinstall complete.
+
+
+	Explanation of the information that needs to be provided:
+
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Field                                              | Description                    
                                                             |
+		+====================================================+==============================================================================================+
+		| Database type                                      | This requests the type of database
to be used. Answer with the default - 'Pg' to indicate a  |
+		|                                                    | PostgreSQL database.           
                                                             |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Database name                                      | The name of the database Traffic
Ops uses to store the configuration information.            |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Database server hostname IP or FQDN                | The hostname of the database server
(``pg`` in the example).                                 |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Database port number                               | The database port number. The default
value, 5432, should be correct unless you changed it   |
+		|                                                    | during the setup.              
                                                             |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Traffic Ops database user                          | The username Traffic Ops will use
to read/write from the database.                           |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Password for Traffic Ops                           | The password for the database user
that Traffic Ops uses.                                    |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Database server root (admin) user name             | Privileged database user that has
permission to create the database and user for Traffic Ops.|
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Database server root (admin) user password         | The password for the privileged
database user.                                               |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Traffic Ops URL                                    | The URL to connect to this instance
of Traffic Ops, usually https://<Traffic Ops host FQDN>/ |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Human-readable CDN Name                            | The name of the first CDN which
Traffic Ops will be manage.                                  |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| DNS sub-domain for which your CDN is authoritative | The DNS domain that will be delegated
to this Traffic Control CDN.                           |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Administration username for Traffic Ops            | The Administration (highest privilege)
Traffic Ops user to create. Use this user to login    |
+		|                                                    | for the first time and create other
users.                                                   |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
+		| Password for the admin user                        | The password for the administrative
Traffic Ops user.                                        |
+		+----------------------------------------------------+----------------------------------------------------------------------------------------------+
 
 
 Traffic Ops is now installed!
@@ -229,15 +241,13 @@ Traffic Ops is now installed!
 
 Upgrading Traffic Ops
 =====================
-To upgrade:
-
-#. Enter the following command:``service traffic_ops stop``
-#. Enter the following command:``yum upgrade traffic_ops``
-#. Enter the following command from the /opt/traffic_ops/app directory:
-   ``PERL5LIB=/opt/traffic_ops/app/lib:/opt/traffic_ops/app/local/lib/perl5 ./db/admin.pl
--env production upgrade``
-#. See :ref:`rl-to-install` to run postinstall.
-#. Enter the following command:``service traffic_ops start``
-
-
+To upgrade from older Traffic Ops versions, run the following commands as the root user (or
with ``sudo``): ::
 
+	systemctl stop traffic_ops
+	yum upgrade traffic_ops
+	pushd /opt/traffic_ops/app/
+	PERL5LIB=/opt/traffic_ops/app/lib:/opt/traffic_ops/app/local/lib/perl5 ./db/admin.pl --env
production upgrade
 
+After this completes, see :ref:`rl-to-install` to run the ``postinstall`` script.
+Once the ``postinstall`` script, has finished, run the following command as the root user
(or with ``sudo``):
+``systemctl start traffic_ops``


Mime
View raw message