diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..133e989c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+.vagrant
+*.swp
+*.swo
+
+.bundle
+vendor/
+
+pkg/
+
+Gemfile.lock
+
+.rbenv*
+.rvmrc*
+.ruby-version
+
+spec/fixtures/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..4dc4d3bc
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+script:
+  - rake lint
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000..56b5e158
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+if ENV.key?('PUPPET_VERSION')
+  puppetversion = "~> #{ENV['PUPPET_VERSION']}"
+else
+  puppetversion = ['>= 2.6']
+end
+
+gem 'puppet',  puppetversion
+gem 'puppet-lint', '>=0.3.2'
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..94a04532
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,621 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 00000000..86286804
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,7 @@
+require 'puppet-lint/tasks/puppet-lint'
+
+PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
+PuppetLint.configuration.send("disable_class_inherits_from_params_class")
+PuppetLint.configuration.send("disable_80chars")
+
+task :default => [:lint]
diff --git a/lib/puppet/provider/katello_ssl_tool.rb b/lib/puppet/provider/katello_ssl_tool.rb
index cb77212e..d5db5647 100644
--- a/lib/puppet/provider/katello_ssl_tool.rb
+++ b/lib/puppet/provider/katello_ssl_tool.rb
@@ -24,6 +24,7 @@ def self.details(cert_name)
 
       passphrase_file = passphrase_file(cert_name)
       if File.exists?(passphrase_file)
+        details[:passphrase_file] = passphrase_file
         details[:passphrase] = File.read(passphrase_file).chomp
       end
 
@@ -33,7 +34,7 @@ def self.details(cert_name)
     def self.pubkey(name)
       # TODO: just temporarily until we have this changes in katello installer as well
       if name == 'candlepin-ca'
-        '/usr/share/katello/candlepin-cert.crt'
+        '/usr/share/katello/candlepin-ca.crt'
       else
         target_path("certs/#{name}.crt")
       end
@@ -169,6 +170,8 @@ class CertFile < Puppet::Provider
 
     initvars
 
+    commands :openssl => 'openssl'
+
     def exists?
       return false unless File.exists?(resource[:path])
       checksum(expected_content) == checksum(current_content)
diff --git a/lib/puppet/provider/key_bundle/katello_ssl_tool.rb b/lib/puppet/provider/key_bundle/katello_ssl_tool.rb
index ad848e18..49d10d88 100644
--- a/lib/puppet/provider/key_bundle/katello_ssl_tool.rb
+++ b/lib/puppet/provider/key_bundle/katello_ssl_tool.rb
@@ -5,14 +5,23 @@
   protected
 
   def expected_content
-    [privkey, pubkey].map { |f| File.read(f) }.join("\n")
+    [privkey, pubkey].join("\n")
+  end
+
+  def pubkey
+    # strips the textual info from the certificate file
+    openssl('x509', '-in', pubkey_source_path)
   end
 
   def privkey
+    File.read(privkey_source_path)
+  end
+
+  def privkey_source_path
     resource[:privkey] || cert_details[:privkey]
   end
 
-  def pubkey
+  def pubkey_source_path
     resource[:pubkey] || cert_details[:pubkey]
   end
 
diff --git a/lib/puppet/provider/privkey/katello_ssl_tool.rb b/lib/puppet/provider/privkey/katello_ssl_tool.rb
index a73e4bf9..5c259711 100644
--- a/lib/puppet/provider/privkey/katello_ssl_tool.rb
+++ b/lib/puppet/provider/privkey/katello_ssl_tool.rb
@@ -4,6 +4,23 @@
 
   protected
 
+  def expected_content
+    if resource[:unprotect]
+      tmp_file = "#{source_path}.tmp"
+      begin
+        openssl('rsa',
+                '-in', source_path,
+                '-out', tmp_file,
+                '-passin', "file:#{cert_details[:passphrase_file]}")
+        File.read(tmp_file)
+      ensure
+        File.delete(tmp_file) if File.exists?(tmp_file)
+      end
+    else
+      super
+    end
+  end
+
   def source_path
     cert_details[:privkey]
   end
diff --git a/lib/puppet/provider/pubkey/katello_ssl_tool.rb b/lib/puppet/provider/pubkey/katello_ssl_tool.rb
index 0263e773..8594b250 100644
--- a/lib/puppet/provider/pubkey/katello_ssl_tool.rb
+++ b/lib/puppet/provider/pubkey/katello_ssl_tool.rb
@@ -4,6 +4,11 @@
 
   protected
 
+  def expected_content
+    # strips the textual info from the certificate file
+    openssl('x509', '-in', source_path)
+  end
+
   def source_path
     cert_details[:pubkey]
   end
diff --git a/lib/puppet/type/privkey.rb b/lib/puppet/type/privkey.rb
index fec63168..200997da 100644
--- a/lib/puppet/type/privkey.rb
+++ b/lib/puppet/type/privkey.rb
@@ -4,4 +4,7 @@
   desc 'Stores the private key file on a location'
 
   instance_eval(&Certs::FILE_COMMON_PARAMS)
+
+  # to make the key unprotected by the passphrase
+  newparam(:unprotect)
 end
diff --git a/manifests/apache.pp b/manifests/apache.pp
new file mode 100644
index 00000000..bc35332c
--- /dev/null
+++ b/manifests/apache.pp
@@ -0,0 +1,60 @@
+class certs::apache (
+    $hostname        = $::certs::node_fqdn,
+    $generate        = $::certs::generate,
+    $regenerate      = $::certs::regenerate,
+    $deploy          = $::certs::deploy,
+    $ca              = $::certs::default_ca,
+    $apache_ssl_cert = $::certs::params::apache_ssl_cert,
+    $apache_ssl_key  = $::certs::params::apache_ssl_key,
+    $apache_ca_cert  = $::certs::params::apache_ca_cert
+  ) inherits certs::params {
+
+  cert { "${::certs::node_fqdn}-ssl":
+    ensure      => present,
+    hostname    => $::certs::node_fqdn,
+    country     => $::certs::country,
+    state       => $::certs::state,
+    city        => $::certs::sity,
+    org         => $::certs::org,
+    org_unit    => $::certs::org_unit,
+    expiration  => $::certs::expiration,
+    ca          => $ca,
+    generate    => $generate,
+    regenerate  => $regenerate,
+    deploy      => $deploy,
+  }
+
+  if $deploy {
+    include apache
+    include apache::ssl
+
+    pubkey { $apache_ssl_cert:
+      ensure => present,
+      cert   => Cert["${::certs::node_fqdn}-ssl"]
+    }
+
+    pubkey { $apache_ca_cert:
+      ensure => present,
+      cert   => $ca
+    }
+
+    privkey { $apache_ssl_key:
+      ensure => present,
+      cert   => Cert["${::certs::node_fqdn}-ssl"]
+    } ->
+    file { $apache_ssl_key:
+      owner => $apache::params::user,
+      group => $apache::params::group,
+      mode  => '0400';
+    }
+
+    file { "${apache::params::configdir}/ssl.conf":
+      content => template('apache/ssl.conf.erb'),
+      mode    => '0644',
+      owner   => 'root',
+      group   => 'root',
+      require => [Pubkey[$apache_ssl_cert], Privkey[$apache_ssl_key]],
+      notify  => Exec['reload-apache'],
+    } -> Service['httpd']
+  }
+}
diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp
new file mode 100644
index 00000000..7e5673aa
--- /dev/null
+++ b/manifests/candlepin.pp
@@ -0,0 +1,69 @@
+# Constains certs specific configurations for candlepin
+class certs::candlepin (
+    $hostname               = $::certs::node_fqdn,
+    $generate               = $::certs::generate,
+    $regenerate             = $::certs::regenerate,
+    $deploy                 = $::certs::deploy,
+    $ca                     = $::certs::default_ca,
+    $storage                = $::certs::params::candlepin_certs_storage,
+    $ca_cert                = $::certs::params::candlepin_ca_cert,
+    $ca_key                 = $::certs::params::candlepin_ca_key,
+    $pki_dir                = $::certs::params::candlepin_pki_dir,
+    $keystore               = $::certs::params::candlepin_keystore,
+    $keystore_password_file = $::certs::params::candlepin_keystore_password_file,
+    $keystore_password      = $::certs::params::candlepin_keystore_password,
+    $candlepin_certs_dir    = $::certs::params::candlepin_certs_dir
+  ) inherits certs::params {
+
+  Exec { logoutput => 'on_failure' }
+
+  if $deploy {
+    file { $keystore_password_file:
+      ensure  => file,
+      content => $keystore_password,
+      mode    => '0644',
+      owner   => 'tomcat',
+      group   => $::certs::user_groups,
+      replace => false;
+    } ~>
+    file { $pki_dir:
+      ensure => directory,
+      owner  => 'root',
+      group  => $::certs::user_groups,
+      mode   => '0750',
+    } ~>
+    pubkey { $ca_cert:
+      cert => $ca,
+    } ~>
+    file { $ca_cert:
+      owner   => 'root',
+      group   => $::certs::user_groups,
+      mode    => '0644';
+    } ~>
+    privkey { $ca_key:
+      cert      => $ca,
+      unprotect => true;
+    } ~>
+    file { $ca_key:
+      owner   => 'root',
+      group   => $::certs::user_groups,
+      mode    => '0640';
+    } ~>
+    exec { 'generate-ssl-keystore':
+      command   => "openssl pkcs12 -export -in ${ca_cert} -inkey ${ca_key} -out ${keystore} -name tomcat -CAfile ${ca_cert} -caname root -password \"file:${keystore_password_file}\"",
+      path      => '/bin:/usr/bin',
+      creates   => $keystore;
+    } ~>
+    file { "/usr/share/${candlepin::tomcat}/conf/keystore":
+      ensure  => link,
+      target  => $keystore;
+    } ~>
+    exec { 'add-candlepin-cert-to-nss-db':
+      command     => "certutil -A -d '${::certs::nss_db_dir}' -n 'ca' -t 'TCu,Cu,Tuw' -a -i '${ca_cert}'",
+      path        => '/usr/bin',
+      subscribe   => Exec['create-nss-db'],
+      refreshonly => true,
+    }
+
+  }
+}
diff --git a/manifests/foreman.pp b/manifests/foreman.pp
new file mode 100644
index 00000000..e8edee91
--- /dev/null
+++ b/manifests/foreman.pp
@@ -0,0 +1,46 @@
+class certs::foreman (
+    $hostname    = $::certs::node_fqdn,
+    $generate    = $::certs::generate,
+    $regenerate  = $::certs::regenerate,
+    $deploy      = $::certs::deploy,
+    $ca          = $::certs::default_ca,
+    $client_cert = $::certs::params::foreman_client_cert,
+    $client_key  = $::certs::params::foreman_client_key,
+    $client_ca   = $::certs::params::foreman_client_ca
+  ) inherits certs::params {
+
+  # cert for authentication of puppetmaster against foreman
+  cert { "${::certs::foreman::hostname}-foreman-client":
+    hostname    => $::certs::foreman::hostname,
+    purpose     => client,
+    country     => $::certs::country,
+    state       => $::certs::state,
+    city        => $::certs::sity,
+    org         => 'FOREMAN',
+    org_unit    => 'PUPPET',
+    expiration  => $::certs::expiration,
+    ca          => $ca,
+    generate    => $generate,
+    regenerate  => $regenerate,
+    deploy      => $deploy,
+  }
+
+  if $deploy {
+    pubkey { $client_cert:
+      cert => Cert["${::certs::foreman::hostname}-foreman-client"],
+    }
+
+    privkey { $client_key:
+      cert => Cert["${::certs::foreman::hostname}-foreman-client"],
+    } ->
+
+    file { $client_key:
+      owner => "foreman",
+      mode  => "0400"
+    }
+
+    pubkey { $client_ca:
+      cert => $ca,
+    }
+  }
+}
diff --git a/manifests/foreman_proxy.pp b/manifests/foreman_proxy.pp
new file mode 100644
index 00000000..14330fbe
--- /dev/null
+++ b/manifests/foreman_proxy.pp
@@ -0,0 +1,46 @@
+class certs::foreman_proxy (
+    $hostname   = $::certs::node_fqdn,
+    $generate   = $::certs::generate,
+    $regenerate = $::certs::regenerate,
+    $deploy     = $::certs::deploy,
+    $ca         = $::certs::default_ca,
+    $proxy_cert = $::certs::params::foreman_proxy_cert,
+    $proxy_key  = $::certs::params::foreman_proxy_key,
+    $proxy_ca   = $::certs::params::foreman_proxy_ca
+  ) inherits certs::params {
+
+  # cert for ssl of foreman-proxy
+  cert { "${::certs::foreman_proxy::hostname}-foreman-proxy":
+    hostname    => $::certs::foreman_proxy::hostname,
+    purpose     => server,
+    country     => $::certs::country,
+    state       => $::certs::state,
+    city        => $::certs::sity,
+    org         => 'FOREMAN',
+    org_unit    => 'SMART_PROXY',
+    expiration  => $::certs::expiration,
+    ca          => $ca,
+    generate    => $generate,
+    regenerate  => $regenerate,
+    deploy      => $deploy,
+  }
+
+  if $deploy {
+    pubkey { $proxy_cert:
+      cert => Cert["${::certs::foreman_proxy::hostname}-foreman-proxy"],
+    }
+
+    privkey { $proxy_key:
+      cert => Cert["${::certs::foreman_proxy::hostname}-foreman-proxy"],
+    } ->
+
+    file { $proxy_key:
+      owner => "foreman-proxy",
+      mode  => "0400"
+    }
+
+    pubkey { $proxy_ca:
+      cert => $ca,
+    }
+  }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index e92660c3..2e5f5832 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,34 +1,93 @@
+# == Class: certs
+#
+# Base for installing and configuring certs. It holds the basic configuration
+# aournd certificates generation and deployment. The per-subsystem configuratoin
+# of certificates should go into `subsystem_module/manifests/certs.pp`.
+#
+# === Parameters:
+#
+# $log_dir::              When the log files should go
+#
+# $node_fqdn::            The fqdn of the host the generated certificates
+#                         should be for
+#
+# $generate::             Should the generation of the certs be part of the
+#                         configuration
+#                         type: boolean
+#
+# $regenerate::           Force regeneration of the certificates (excluding
+#                         ca certificates)
+#                         type: boolean
+#
+# $regenerate_ca::        Force regeneration of the ca certificate
+#                         type: boolean
+#
+# $deploy::               Deploy the certs on the configured system. False means
+#                         we want apply it on a different system
+#                         type: boolean
+#
+# $ca_common_name::       Common name for the generated CA certificate
+#                         type: string
+#
+# $country::              Country attribute for managed certificates
+#                         type: string
+#
+# $state::                State attribute for managed certificates
+#                         type: string
+#
+# $city::                 City attribute for managed certificates
+#                         type: string
+#
+# $org::                  Org attribute for managed certificates
+#                         type: string
+#
+# $org_unit::             Org unit attribute for managed certificates
+#                         type: string
+#
+# $expiration::           Expiration attribute for managed certificates
+#                         type: string
+#
+# $ca_expiration::        Ca expiration attribute for managed certificates
+#                         type: string
+#
 class certs (
-  $node_fqdn      = $fqdn,
-  $generate       = true,
-  $regenerate     = false,
-  $regenerate_ca  = false,
-  $deploy         = false,
-  $ca_common_name    = $certs::params::ca_common_name,
+
+  $log_dir        = $certs::params::log_dir,
+  $node_fqdn      = $certs::params::node_fqdn,
+  $generate       = $certs::params::generate,
+  $regenerate     = $certs::params::regenerate,
+  $regenerate_ca  = $certs::params::regenerate_ca,
+  $deploy         = $certs::params::deploy,
+  $ca_common_name = $certs::params::ca_common_name,
   $country        = $certs::params::country,
   $state          = $certs::params::state,
-  $city           = $certs::params::sity,
+  $city           = $certs::params::city,
   $org            = $certs::params::org,
   $org_unit       = $certs::params::org_unit,
 
   $expiration     = $certs::params::expiration,
-  $ca_expiration     = $certs::params::ca_expiration
-  ) inherits params {
+  $ca_expiration  = $certs::params::ca_expiration
+  ) inherits certs::params {
+
+  $user_groups            = $certs::params::user_groups
+  $nss_db_dir             = $certs::params::nss_db_dir
+
+  class { 'certs::install': }
 
   $default_ca = Ca['candlepin-ca']
 
   ca { 'candlepin-ca':
     ensure      => present,
     common_name => $certs::ca_common_name,
-    country => $certs::country,
-    state   => $certs::state,
-    city    => $certs::city,
-    org     => $certs::org,
-    org_unit => $certs::org_unit,
-    expiration => $certs::ca_expiration,
-    generate => $certs::generate,
-    regenerate => $certs::regenerate_ca,
-    deploy   => true,
+    country     => $certs::country,
+    state       => $certs::state,
+    city        => $certs::city,
+    org         => $certs::org,
+    org_unit    => $certs::org_unit,
+    expiration  => $certs::ca_expiration,
+    generate    => $certs::generate,
+    regenerate  => $certs::regenerate_ca,
+    deploy      => true,
   }
 
 }
diff --git a/manifests/install.pp b/manifests/install.pp
new file mode 100644
index 00000000..eadbfafb
--- /dev/null
+++ b/manifests/install.pp
@@ -0,0 +1,6 @@
+# Certs Installation
+class certs::install {
+  package{['katello-certs-tools']:
+    ensure => installed,
+  }
+}
diff --git a/manifests/katello.pp b/manifests/katello.pp
new file mode 100644
index 00000000..5578ffb6
--- /dev/null
+++ b/manifests/katello.pp
@@ -0,0 +1,40 @@
+# Katello specific certs settings
+class certs::katello {
+
+  $ssl_build_path                 = '/root/ssl-build'
+  $katello_www_pub_dir            = '/var/www/html/pub'
+  $candlepin_cert_name            = 'candlepin-ca'
+  $candlepin_consumer_name        = "${candlepin_cert_name}-consumer-${::fqdn}"
+  $candlepin_consumer_summary     = "Subscription-manager consumer certificate for Katello instance ${::fqdn}"
+  $candlepin_consumer_description = 'Consumer certificate and post installation script that configures rhsm.'
+
+  file { $katello_www_pub_dir:
+    ensure => directory,
+    owner  => 'apache',
+    group  => 'apache',
+    mode   => '0755';
+  } ->
+  file { $ssl_build_path:
+    ensure => directory,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0700';
+  } ->
+  file { "${ssl_build_path}/rhsm-katello-reconfigure":
+    content => template('certs/rhsm-katello-reconfigure.erb'),
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0700',
+  } ~>
+  exec { 'generate-candlepin-consumer-certificate':
+    cwd       => $katello_www_pub_dir,
+    command   => "gen-rpm.sh --name '${candlepin_consumer_name}' --version 1.0 --release 1 --packager None --vendor None --group 'Applications/System' --summary '${candlepin_consumer_summary}' --description '${candlepin_consumer_description}' --requires subscription-manager --post ${ssl_build_path}/rhsm-katello-reconfigure /etc/rhsm/ca/candlepin-local.pem:644=${ssl_build_path}/${candlepin_cert_name}.crt && /sbin/restorecon ./*rpm",
+    path      => '/usr/share/katello/certs:/usr/bin:/bin',
+    creates   => "${katello_www_pub_dir}/${candlepin_consumer_name}-1.0-1.noarch.rpm",
+    logoutput => 'on_failure';
+  } ~>
+  file { "${katello_www_pub_dir}/${candlepin_cert_name}-consumer-latest.noarch.rpm":
+    ensure  => 'link',
+    target  => "${katello_www_pub_dir}/${candlepin_consumer_name}-1.0-1.noarch.rpm",
+  }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index c91b3794..e375d17d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,10 +1,61 @@
+# Certs Parameters
 class certs::params {
-  $ca_common_name = $fqdn  # we need fqdn as CA common name as candlepin uses it as a ssl cert
-  $country = 'US'
-  $state   = 'North Carolina'
-  $city    = 'Raleigh'
-  $org     = 'SomeOrg'
-  $org_unit = 'SomeOrgUnit'
-  $expiration = '365'
+
+  if file_exists('/usr/sbin/tomcat') and file_exists('/usr/sbin/tomcat6') {
+    $tomcat = 'tomcat'
+  }
+  else {
+    $tomcat = 'tomcat6'
+  }
+
+  $log_dir = '/var/log/certs'
+
+  $node_fqdn = $::fqdn
+
+  $ca_common_name = $::fqdn  # we need fqdn as CA common name as candlepin uses it as a ssl cert
+
+  $generate      = true
+  $regenerate    = false
+  $regenerate_ca = false
+  $deploy        = true
+
+  $country       = 'US'
+  $state         = 'North Carolina'
+  $city          = 'Raleigh'
+  $org           = 'SomeOrg'
+  $org_unit      = 'SomeOrgUnit'
+  $expiration    = '365'
   $ca_expiration = '36500'
+
+  $nss_db_password_file   = '/etc/katello/nss_db_password-file'
+  $nss_db_dir             = '/etc/pki/katello/nssdb'
+  $ssl_pk12_password_file = '/etc/katello/pk12_password-file'
+
+  $user_groups = 'foreman'
+
+  $foreman_client_cert = '/etc/foreman/client_cert.pem'
+  $foreman_client_key  = '/etc/foreman/client_key.pem'
+  $foreman_client_ca   = '/etc/foreman/client_ca.pem'
+
+  $foreman_proxy_cert = '/etc/foreman-proxy/ssl_cert.pem'
+  $foreman_proxy_key  = '/etc/foreman-proxy/ssl_key.pem'
+  $foreman_proxy_ca   = '/etc/foreman-proxy/ssl_ca.pem'
+
+  $puppet_client_cert = '/etc/puppet/client_cert.pem'
+  $puppet_client_key  = '/etc/puppet/client_key.pem'
+  $puppet_client_ca   = '/etc/puppet/client_ca.pem'
+
+  $apache_ssl_cert = '/etc/pki/tls/certs/katello-node.crt'
+  $apache_ssl_key  = '/etc/pki/tls/private/katello-node.key'
+  $apache_ca_cert  = '/etc/pki/tls/certs/katello-ca.crt'
+
+  $candlepin_certs_storage          = '/etc/candlepin/certs'
+  $candlepin_ca_cert                = '/etc/candlepin/certs/candlepin-ca.crt'
+  $candlepin_ca_key                 = '/etc/candlepin/certs/candlepin-ca.key'
+  $candlepin_pki_dir                = '/etc/pki/katello'
+  $candlepin_keystore               = '/etc/pki/katello/keystore'
+  $candlepin_keystore_password_file = '/etc/katello/keystore_password-file'
+  $candlepin_keystore_password      = find_or_create_password($candlepin_keystore_password_file)
+  $candlepin_certs_dir              = '/etc/candlepin/certs'
+
 }
diff --git a/manifests/pulp_child.pp b/manifests/pulp_child.pp
new file mode 100644
index 00000000..b75e9dab
--- /dev/null
+++ b/manifests/pulp_child.pp
@@ -0,0 +1,20 @@
+# Pulp Node Certs
+class certs::pulp_child (
+    $hostname   = $::certs::node_fqdn,
+    $generate   = $::certs::generate,
+    $regenerate = $::certs::regenerate,
+    $deploy     = $::certs::deploy,
+    $ca         = $::certs::default_ca
+  ) {
+
+  if $deploy {
+    pubkey { $pulp::consumers_ca_cert:
+      cert => $ca,
+    } ~>
+
+    pubkey { $pulp::ssl_ca_cert:
+      # Defined in certs::apache module
+      cert => Cert["${::certs::pulp_child::hostname}-ssl"],
+    }
+  }
+}
diff --git a/manifests/pulp_parent.pp b/manifests/pulp_parent.pp
new file mode 100644
index 00000000..6d09c654
--- /dev/null
+++ b/manifests/pulp_parent.pp
@@ -0,0 +1,60 @@
+# Pulp Master Certs configuration
+class certs::pulp_parent (
+    $hostname = $::certs::node_fqdn,
+    $generate = $::certs::generate,
+    $regenerate = $::certs::regenerate,
+    $deploy   = $::certs::deploy,
+    $ca       = $::certs::default_ca,
+    $nodes_cert = '/etc/pki/pulp/nodes/node.crt',
+    $messaging_ca_cert = $pulp::params::messaging_ca_cert,
+    $messaging_client_cert = $pulp::params::messaging_client_cert
+  ) inherits pulp::params {
+
+  # cert for nodes authenitcation
+  cert { "${::certs::pulp_parent::hostname}-parent-cert":
+    hostname    => $certs::pulp_parent::hostname,
+    common_name => 'pulp-child-node-cert',
+    purpose     => client,
+    country     => $::certs::country,
+    state       => $::certs::state,
+    city        => $::certs::sity,
+    org         => 'PULP',
+    org_unit    => 'NODES',
+    expiration  => $::certs::expiration,
+    ca          => $ca,
+    generate    => $generate,
+    regenerate  => $regenerate,
+    deploy      => $deploy,
+  }
+
+  cert { "${::certs::pulp_parent::hostname}-qpid-client-cert":
+    hostname    => $::certs::pulp_parent::hostname,
+    common_name => 'pulp-qpid-client-cert',
+    purpose     => client,
+    country     => $::certs::country,
+    state       => $::certs::state,
+    city        => $::certs::sity,
+    org         => 'PULP',
+    org_unit    => $::certs::org_unit,
+    expiration  => $::certs::expiration,
+    ca          => $ca,
+    generate    => $generate,
+    regenerate  => $regenerate,
+    deploy      => $deploy,
+  }
+
+  if $deploy {
+    key_bundle { $::certs::pulp_parent::nodes_cert:
+      cert => Cert["${::certs::pulp_parent::hostname}-parent-cert"],
+    }
+
+    key_bundle { $messaging_client_cert:
+      cert => Cert["${::certs::pulp_parent::hostname}-qpid-client-cert"],
+    } ~>
+    file { $messaging_client_cert:
+      owner   => 'apache',
+      group   => 'apache',
+      mode    => '0640',
+    }
+  }
+}
diff --git a/manifests/puppet.pp b/manifests/puppet.pp
new file mode 100644
index 00000000..7582462b
--- /dev/null
+++ b/manifests/puppet.pp
@@ -0,0 +1,46 @@
+class certs::puppet (
+    $hostname    = $::certs::node_fqdn,
+    $generate    = $::certs::generate,
+    $regenerate  = $::certs::regenerate,
+    $deploy      = $::certs::deploy,
+    $ca          = $::certs::default_ca,
+    $client_cert = $::certs::params::puppet_client_cert,
+    $client_key  = $::certs::params::puppet_client_key,
+    $client_ca   = $::certs::params::puppet_client_ca
+  ) inherits certs::params {
+
+  # cert for authentication of puppetmaster against foreman
+  cert { "${::certs::puppet::hostname}-puppet-client":
+    hostname    => $::certs::puppet::hostname,
+    purpose     => client,
+    country     => $::certs::country,
+    state       => $::certs::state,
+    city        => $::certs::sity,
+    org         => 'FOREMAN',
+    org_unit    => 'PUPPET',
+    expiration  => $::certs::expiration,
+    ca          => $ca,
+    generate    => $generate,
+    regenerate  => $regenerate,
+    deploy      => $deploy,
+  }
+
+  if $deploy {
+    pubkey { $client_cert:
+      cert => Cert["${::certs::puppet::hostname}-puppet-client"],
+    }
+
+    privkey { $client_key:
+      cert => Cert["${::certs::puppet::hostname}-puppet-client"],
+    } ->
+
+    file { $client_key:
+      owner => "puppet",
+      mode  => "0400",
+    }
+
+    pubkey { $client_ca:
+      cert => $ca,
+    }
+  }
+}
diff --git a/manifests/qpid.pp b/manifests/qpid.pp
new file mode 100644
index 00000000..524386fa
--- /dev/null
+++ b/manifests/qpid.pp
@@ -0,0 +1,106 @@
+class certs::qpid (
+  $hostname = $::certs::node_fqdn,
+  $generate = $::certs::generate,
+  $regenerate = $::certs::regenerate,
+  $deploy   = $::certs::deploy,
+  $ca       = $::certs::default_ca
+  ){
+
+  Exec { logoutput => 'on_failure' }
+
+  if $::qpid::ssl {
+
+    cert { "${::certs::qpid::hostname}-qpid-broker":
+      ensure      => present,
+      hostname    => $::certs::qpid::hostname,
+      country     => $::certs::country,
+      state       => $::certs::state,
+      city        => $::certs::sity,
+      org         => 'pulp',
+      org_unit    => $::certs::org_unit,
+      expiration  => $::certs::expiration,
+      ca          => $ca,
+      generate    => $generate,
+      regenerate  => $regenerate,
+      deploy      => $deploy,
+    }
+
+    if $deploy {
+
+      $nss_db_password_file   = $certs::params::nss_db_password_file
+      $ssl_pk12_password_file = $certs::params::ssl_pk12_password_file
+      $qpid_cert_name         = 'qpid-broker'
+      $client_cert            = "/etc/pki/katello/${qpid_cert_name}.crt"
+      $client_key             = "/etc/pki/katello/${qpid_cert_name}.key"
+      $pfx_path               = "/etc/pki/katello/${qpid_cert_name}.pfx"
+      $nssdb_files            = ["${::certs::nss_db_dir}/cert8.db", "${::certs::nss_db_dir}/key3.db", "${::certs::nss_db_dir}/secmod.db"]
+
+      pubkey { $client_cert:
+        cert => Cert["${::certs::qpid::hostname}-qpid-broker"]
+      } ~>
+      privkey { $client_key:
+        cert => Cert["${::certs::qpid::hostname}-qpid-broker"]
+      } ~>
+      file { $client_key:
+        owner   => 'root',
+        group   => $::certs::user_groups,
+        mode    => '0400',
+      } ~>
+      exec { 'generate-nss-password':
+        command => "openssl rand -base64 24 > ${nss_db_password_file}",
+        path    => '/usr/bin',
+        creates => $nss_db_password_file
+      } ->
+      file { $nss_db_password_file:
+        owner   => 'root',
+        group   => $::certs::user_groups,
+        mode    => '0640',
+      } ~>
+      exec { 'generate-pk12-password':
+        path    => '/usr/bin',
+        command => "openssl rand -base64 24 > ${ssl_pk12_password_file}",
+        creates => $ssl_pk12_password_file
+      } ~>
+      file { $ssl_pk12_password_file:
+        owner   => 'root',
+        group   => 'root',
+        mode    => '0600',
+        require => Exec['generate-pk12-password']
+      } ~>
+      file { $::certs::nss_db_dir:
+        ensure => directory,
+        owner  => 'root',
+        group  => $certs::user_groups,
+        mode   => '0744',
+      } ~>
+      exec { 'create-nss-db':
+        command => "certutil -N -d '${::certs::nss_db_dir}' -f '${nss_db_password_file}'",
+        path    => '/usr/bin',
+        creates => $nssdb_files,
+      } ~>
+      file { $nssdb_files:
+        owner   => 'root',
+        group   => $::certs::user_groups,
+        mode    => '0640',
+      } ~>
+      exec { 'add-broker-cert-to-nss-db':
+        command     => "certutil -A -d '${::certs::nss_db_dir}' -n 'broker' -t ',,' -a -i '${client_cert}'",
+        path        => '/usr/bin',
+        refreshonly => true,
+      } ~>
+      exec { 'generate-pfx-for-nss-db':
+        command     => "openssl pkcs12 -in ${client_cert} -inkey ${client_key} -export -out '${pfx_path}' -password 'file:${ssl_pk12_password_file}'",
+        path        => '/usr/bin',
+        refreshonly => true,
+      } ~>
+      exec { 'add-private-key-to-nss-db':
+        command     => "pk12util -i '${pfx_path}' -d '${::certs::nss_db_dir}' -w '${ssl_pk12_password_file}' -k '${nss_db_password_file}'",
+        path        => '/usr/bin',
+        refreshonly => true,
+      }
+
+    }
+
+  }
+
+}
diff --git a/manifests/tar_create.pp b/manifests/tar_create.pp
index 8680ff33..e07ecf48 100644
--- a/manifests/tar_create.pp
+++ b/manifests/tar_create.pp
@@ -1,7 +1,21 @@
+# Definition: certs::tar_create
+#
+# This class creates a tar ball of generated SSL certs
+#
+# Parameters:
+# - The $path of files to tar up
+# - The $child node FQDN
+#
+# Actions:
+# - Create a tarball of SSL certs
+#
+# Requires:
+# - The certs class
+#
 define certs::tar_create($path = $title, $child = $::certs::node_fqdn) {
-  exec { "generate $path":
-    cwd => '/root',
-    path => ['/usr/bin', '/bin'],
-    command => "tar -czf $path ssl-build/*.noarch.rpm ssl-build/$child/*.noarch.rpm",
+  exec { "generate ${path}":
+    cwd     => '/root',
+    path    => ['/usr/bin', '/bin'],
+    command => "tar -czf ${path} ssl-build/*.noarch.rpm ssl-build/${child}/*.noarch.rpm",
   }
 }
diff --git a/manifests/tar_extract.pp b/manifests/tar_extract.pp
index 7811f7d1..8f453e75 100644
--- a/manifests/tar_extract.pp
+++ b/manifests/tar_extract.pp
@@ -1,7 +1,20 @@
+# Definition: certs::tar_extract
+#
+# This class extracts a tarball
+#
+# Parameters:
+# - The $path of the tarball to extract
+#
+# Actions:
+# - Extracts a tarball
+#
+# Requires:
+# - The certs class
+#
 define certs::tar_extract($path = $title) {
-  exec { "extract $path":
-    cwd => '/root',
-    path => ['/usr/bin', '/bin'],
-    command => "tar -xzf $path"
+  exec { "extract ${path}":
+    cwd     => '/root',
+    path    => ['/usr/bin', '/bin'],
+    command => "tar -xzf ${path}"
   }
 }
diff --git a/templates/rhsm-katello-reconfigure.erb b/templates/rhsm-katello-reconfigure.erb
new file mode 100755
index 00000000..4ee1dc6e
--- /dev/null
+++ b/templates/rhsm-katello-reconfigure.erb
@@ -0,0 +1,69 @@
+#!/bin/bash
+#
+# Copyright 2013 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+#
+# Configures rhsm on client. Called from the certificate RPM.
+#
+
+KATELLO_SERVER=<%= has_variable?("fqdn") ? fqdn : hostname %>
+PORT=443
+<% if scope.lookupvar("katello::params::deployment") == 'katello' %>
+BASEURL=https://$KATELLO_SERVER/pulp/repos
+<% else %>
+BASEURL=https://$KATELLO_SERVER:8088
+<% end %>
+PREFIX=/<%=scope.lookupvar("katello::params::deployment_url")%>/api
+CFG=/etc/rhsm/rhsm.conf
+CFG_BACKUP=$CFG.kat-backup
+
+# Get version of RHSM
+RHSM_V="`rpm -q --queryformat='%{VERSION}' subscription-manager 2> /dev/null | tr . ' '`"
+if test $? != 0 ; then
+  RHSM_V="0 0 0"
+fi
+declare -a RHSM_VERSION=($RHSM_V)
+
+# exit on non-RHEL systems or when rhsm.conf is not found
+test -f $CFG || exit
+type -P subscription-manager >/dev/null || type -P subscription-manager-cli >/dev/null || exit
+
+# backup configuration during the first run
+test -f $CFG_BACKUP || cp $CFG $CFG_BACKUP
+
+# configure rhsm
+# the config command was introduced in rhsm 0.96.6
+# fallback left for older versions
+if test ${RHSM_VERSION[0]:-0} -gt 0 -o ${RHSM_VERSION[1]:-0} -gt 96 -o \( ${RHSM_VERSION[1]:-0} -eq 96 -a ${RHSM_VERSION[2]:-0} -gt 6 \); then
+  subscription-manager config \
+    --server.hostname="$KATELLO_SERVER" \
+    --server.prefix="$PREFIX" \
+    --server.port="$PORT" \
+    --rhsm.repo_ca_cert="%%(ca_cert_dir)scandlepin-local.pem" \
+    --rhsm.baseurl="$BASEURL"
+else
+  sed -i "s/^hostname\s*=.*/hostname = $KATELLO_SERVER/g" $CFG
+  sed -i "s/^port\s*=.*/port = $PORT/g" $CFG
+  sed -i "s/^prefix\s*=.*/prefix = $PREFIX/g" $CFG
+  sed -i 's/^repo_ca_cert\s*=.*/repo_ca_cert = %%(ca_cert_dir)scandlepin-local.pem/g' $CFG
+  sed -i "s|^baseurl\s*=.*|baseurl=$BASEURL|g" $CFG
+fi
+
+# restart goferd if it is installed and running
+[ -f /etc/init.d/goferd ] && \
+  service goferd status >/dev/null && \
+  service goferd restart >/dev/null 2&>1
+
+exit 0
+
+# vim:sw=2:ts=2:et: