Skip to content

Commit 9b2a0d9

Browse files
committed
Fix markdown list syntax
1 parent cbeb866 commit 9b2a0d9

File tree

1 file changed

+50
-75
lines changed

1 file changed

+50
-75
lines changed

README.md

Lines changed: 50 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ Table of Contents
55
* [What You Get From This control\-repo](#what-you-get-from-this-control-repo)
66
* [Copy This Repo Into Your Own Git Server](#copy-this-repo-into-your-own-git-server)
77
* [GitLab](#gitlab)
8-
* [Bitbucket/Stash](#Bitbucket/Stash)
8+
* [Bitbucket/Stash](#bitbucketstash)
99
* [Github](#github)
1010

11-
Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc.go)
12-
1311
# Where Did All The Previous Code Go?
1412

1513
Initially, the control-repo project began as a 'starter' template for anyone who wanted to get started with r10k. As time passed, and Code Manager was integrated into Puppet Enterprise, the scope of this project grew to include opinionated Puppet profiles to set up many Puppet Enterprise components. As the code increased, so did the complexity of the control-repo project. To reduce that complexity, as well as continuing to meet the needs of individuals who would like a more minimal template, this repository was stripped of anything other than the bare minimum files necessary to get started with a functioning
@@ -22,97 +20,74 @@ All of the code that was previously in this repository still exists in separate
2220
This repository is a template control-repo that can be used with r10k or Puppet Enterprise Code Manager.
2321

2422
The major points are:
25-
- An environment.conf that correctly implements:
26-
- A site directory for roles, profiles, and any custom modules for your organization.
27-
- A config_version script.
28-
- Provided config_version scripts to output the commit of code that your agent just applied.
29-
- Basic example of roles/profiles code.
30-
- Example hieradata directory with pre-created common.yaml and nodes directory.
31-
- These match the default hierarchy that ships with PE.
23+
* An environment.conf that correctly implements:
24+
* A site directory for roles, profiles, and any custom modules for your organization.
25+
* A config_version script.
26+
* Provided config_version scripts to output the commit of code that your agent just applied.
27+
* Basic example of roles/profiles code.
28+
* Example hieradata directory with pre-created common.yaml and nodes directory.
29+
* These match the default hierarchy that ships with PE.
3230

3331
## Copy This Repo Into Your Own Git Server
3432

3533
### GitLab
3634

3735
1. Install GitLab.
38-
- https://about.gitlab.com/downloads/
39-
40-
2. After GitLab is installed you may sign in with the `root` user and password `5iveL!fe`.
41-
42-
3. Make a user for yourself.
43-
44-
4. Make an SSH key to link with your user. You’ll want to do this on the machine you intend to edit code from (most likely not your Puppet master, but your local workstation or laptop).
45-
- http://doc.gitlab.com/ce/ssh/README.html
46-
- https://help.github.com/articles/generating-ssh-keys/
47-
48-
5. Create a group called `puppet` (this is case sensitive).
49-
- http://doc.gitlab.com/ce/workflow/groups.html
50-
51-
6. Add your user to the `puppet` group as well.
52-
53-
7. Create a project called `control-repo`, and set the Namespace to be the `puppet` group.
54-
55-
8. Clone this control repository to your laptop/workstation:
56-
- `git clone <repository url>`
57-
- `cd control-repo`
58-
59-
9. Remove this repository as the origin remote:
60-
- `git remote remove origin`
61-
62-
10. Add your internal repository as the origin remote:
63-
- `git remote add origin <url of your gitlab repository>`
64-
65-
11. Push the production branch of the repository from your machine up to your git server
66-
- `git push origin production`
36+
* <https://about.gitlab.com/downloads/>
37+
1. After GitLab is installed you may sign in with the `root` user and password `5iveL!fe`.
38+
1. Make a user for yourself.
39+
1. Make an SSH key to link with your user. You’ll want to do this on the machine you intend to edit code from (most likely not your Puppet master, but your local workstation or laptop).
40+
* <http://doc.gitlab.com/ce/ssh/README.html>
41+
* <https://help.github.com/articles/generating-ssh-keys/>
42+
1. Create a group called `puppet` (this is case sensitive).
43+
* <http://doc.gitlab.com/ce/workflow/groups.html>
44+
1. Add your user to the `puppet` group as well.
45+
1. Create a project called `control-repo`, and set the Namespace to be the `puppet` group.
46+
1. Clone this control repository to your laptop/workstation:
47+
* `git clone <repository url>`
48+
* `cd control-repo`
49+
1. Remove this repository as the origin remote:
50+
* `git remote remove origin`
51+
1. Add your internal repository as the origin remote:
52+
* `git remote add origin <url of your gitlab repository>`
53+
1. Push the production branch of the repository from your machine up to your git server
54+
* `git push origin production`
6755

6856
### Bitbucket/Stash
6957

7058
1. Install Bitbucket
71-
- https://www.atlassian.com/software/bitbucket/download
72-
59+
* <https://www.atlassian.com/software/bitbucket/download>
7360
1. Make a `Project` called `puppet` (with a short name of `PUP`)
74-
7561
1. Create a repository called `control-repo`
76-
77-
1. * Create a user called `r10k` with a password of `puppet`.
78-
* Make the r10k user an admin of the `PUP` project.
79-
62+
1. Create a user called `r10k` with a password of `puppet`.
63+
* Make the r10k user an admin of the `PUP` project.
8064
1. Either use the admin user to test pushing code, or create a user for yourself and add your SSH key to that user.
81-
* If making a user for yourself, give your user account read/write or admin privilege to the `PUP` project.
82-
65+
* If making a user for yourself, give your user account read/write or admin privilege to the `PUP` project.
8366
1. Clone this control repository to your laptop/workstation
84-
- `git clone <repository url>`
85-
- `cd control-repo`
86-
67+
* `git clone <repository url>`
68+
* `cd control-repo`
8769
1. Remove this repository as the origin remote
88-
- `git remote remove origin`
89-
70+
* `git remote remove origin`
9071
1. Add your internal repository as the origin remote
91-
- `git remote add origin <url of your bitbucket repository>`
92-
72+
* `git remote add origin <url of your bitbucket repository>`
9373
1. Push the production branch of the repository from your machine up to your git server
94-
- `git push origin production`
74+
* `git push origin production`
9575

9676
### GitHub
9777

9878
1. Prepare your local git client to authenticate with GitHub.com or a local GitHub Enterprise instance.
99-
- https://help.github.com/articles/generating-ssh-keys/
100-
- https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/
101-
102-
2. Create a repository called `control-repo` in your user account or organization. Ensure that "Initialize this repository with a README" is not selected.
103-
- https://help.github.com/articles/creating-a-new-repository/
104-
105-
3. Make a note of your repository URL (HTTPS or SSH, depending on your security configuration).
106-
107-
4. Clone this control repository to your laptop/workstation:
108-
- `git clone <repository url>`
109-
- `cd control-repo`
110-
111-
5. Remove this repository as the origin remote:
112-
- `git remote remove origin`
113-
114-
6. Add your internal repository as the origin remote:
115-
- `git remote add origin <url of your github repository>`
79+
* <https://help.github.com/articles/generating-ssh-keys/>
80+
* <https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/>
81+
1. Create a repository called `control-repo` in your user account or organization. Ensure that "Initialize this repository with a README" is not selected.
82+
* <https://help.github.com/articles/creating-a-new-repository/>
83+
1. Make a note of your repository URL (HTTPS or SSH, depending on your security configuration).
84+
1. Clone this control repository to your laptop/workstation:
85+
* `git clone <repository url>`
86+
* `cd control-repo`
87+
1. Remove this repository as the origin remote:
88+
* `git remote remove origin`
89+
1. Add your internal repository as the origin remote:
90+
* `git remote add origin <url of your github repository>`
91+
1. Push the production branch of the repository from your machine up to your git server
92+
* `git push origin production`
11693

117-
7. Push the production branch of the repository from your machine up to your git server
118-
- `git push origin production`

0 commit comments

Comments
 (0)