Skip to content

Commit

Permalink
(SIMP-317) making password its own section
Browse files Browse the repository at this point in the history
Also reordered sections and made a change to a file
and prototyped conf.py with version number

SIMP-317 #close
  • Loading branch information
Judy Johnson committed Jul 29, 2015
1 parent 408b3e8 commit 68878f4
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 80 deletions.
2 changes: 1 addition & 1 deletion docs/common/Introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SIMP is designed for use by system administrators or users with a strong
background using Linux operating systems. The core applications that
make up SIMP and require prerequisite knowledge are:

- :term:`Puppet` - 2.7.13 or later
- :term:`Puppet` - 3.7 or later

- :term:`Domain Name System (DNS)` - BIND 9

Expand Down
8 changes: 7 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,4 +290,10 @@


# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}
#intersphinx_mapping = {'https://docs.python.org/': None}

# PDF
#extensions = ['sphinx.ext.autodoc','rst2pdf.pdfbuilder']

# tag
tags.add('simp_5')
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ Contents:
.. toctree::
:maxdepth: 1

User Guide <user_guide/index>
Installation Guide <installation_guide/index>
User Guide <user_guide/index>
Security Concept of Operations <security_conop/index>
license
help
Expand Down
6 changes: 6 additions & 0 deletions docs/installation_guide/SIMP_Server_Installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ which includes Puppet Environments
work well with capital letters in host names. Therefore, they should
not be used.


SIMP Default Passwords and Settings
-----------------------------------

Below is a table containing the default passwords found on a basic SIMP
server.

Expand All @@ -75,6 +79,7 @@ server.
All default passwords should be changed during the initial
configuration proceess.


+-------------+-----------------------------------+
| Utility | Password |
+=============+===================================+
Expand Down Expand Up @@ -125,6 +130,7 @@ environment.

Table: Sample values for SIMP install


Preparing the SIMP Server Environment
-------------------------------------

Expand Down
1 change: 0 additions & 1 deletion docs/installation_guide/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ Contents:
../common/Changelog
glossary
../common/File_Samples

0 comments on commit 68878f4

Please sign in to comment.