Selaa lähdekoodia

Merge pull request #2 from mikeashley/ariddell-feature-fix

Add missing configuration parameter for ircbouncer
Allen Riddell 9 vuotta sitten
vanhempi
commit
6d5a2ff718
3 muutettua tiedostoa jossa 15 lisäystä ja 7 poistoa
  1. 11
    7
      README.md
  2. 1
    0
      roles/ircbouncer/defaults/main.yml
  3. 3
    0
      roles/news/handlers/main.yml

+ 11
- 7
README.md Näytä tiedosto

62
 Installation
62
 Installation
63
 ------------
63
 ------------
64
 
64
 
65
-### 1. Get a Tarsnap machine key
65
+### 1. Install required packages
66
+
67
+    apt-get install sudo
68
+
69
+### 2. Get a Tarsnap machine key
66
 
70
 
67
 If you haven’t already, [download and install Tarsnap](https://www.tarsnap.com/download.html), or use `brew install tarsnap` if you use [Homebrew](http://brew.sh).
71
 If you haven’t already, [download and install Tarsnap](https://www.tarsnap.com/download.html), or use `brew install tarsnap` if you use [Homebrew](http://brew.sh).
68
 
72
 
70
 
74
 
71
     tarsnap-keygen --keyfile roles/tarsnap/files/decrypted_tarsnap.key --user me@example.com --machine example.com
75
     tarsnap-keygen --keyfile roles/tarsnap/files/decrypted_tarsnap.key --user me@example.com --machine example.com
72
 
76
 
73
-### 2. Prep the server
77
+### 3. Prep the server
74
 
78
 
75
 For goodness sake, change the root password:
79
 For goodness sake, change the root password:
76
 
80
 
93
 
97
 
94
 Your new account will be automatically set up for passwordless `sudo`.
98
 Your new account will be automatically set up for passwordless `sudo`.
95
 
99
 
96
-### 3. Configure your installation
100
+### 4. Configure your installation
97
 
101
 
98
 Modify the settings in `group_vars/sovereign` to your liking. If you want to see how they’re used in context, just search for the corresponding string.
102
 Modify the settings in `group_vars/sovereign` to your liking. If you want to see how they’re used in context, just search for the corresponding string.
99
 All of the variables in `group_vars/sovereign` must be set for sovereign to function.
103
 All of the variables in `group_vars/sovereign` must be set for sovereign to function.
146
 
150
 
147
 Finally, replace the `host.example.net` in the file `hosts`. If your SSH daemon listens on a non-standard port, add a colon and the port number after the IP address. In that case you also need to add your custom port to the task `Set firewall rules for web traffic and SSH` in the file `roles/common/tasks/ufw.yml`.
151
 Finally, replace the `host.example.net` in the file `hosts`. If your SSH daemon listens on a non-standard port, add a colon and the port number after the IP address. In that case you also need to add your custom port to the task `Set firewall rules for web traffic and SSH` in the file `roles/common/tasks/ufw.yml`.
148
 
152
 
149
-### 4. Set up DNS
153
+### 5. Set up DNS
150
 
154
 
151
 If you’ve just bought a new domain name, point it at [Linode’s DNS Manager](https://library.linode.com/dns-manager) or similar. Most VPS services (and even some domain registrars) offer a managed DNS service that you can use for this at no charge. If you’re using an existing domain that’s already managed elsewhere, you can probably just modify a few records.
155
 If you’ve just bought a new domain name, point it at [Linode’s DNS Manager](https://library.linode.com/dns-manager) or similar. Most VPS services (and even some domain registrars) offer a managed DNS service that you can use for this at no charge. If you’re using an existing domain that’s already managed elsewhere, you can probably just modify a few records.
152
 
156
 
161
 * `cloud.example.com` (for ownCloud)
165
 * `cloud.example.com` (for ownCloud)
162
 * `git.example.com` (for cgit)
166
 * `git.example.com` (for cgit)
163
 
167
 
164
-### 5. Run the Ansible Playbooks
168
+### 6. Run the Ansible Playbooks
165
 
169
 
166
 First, make sure you’ve [got Ansible 1.9.3+ installed](http://docs.ansible.com/intro_installation.html#getting-ansible).
170
 First, make sure you’ve [got Ansible 1.9.3+ installed](http://docs.ansible.com/intro_installation.html#getting-ansible).
167
 
171
 
177
 
181
 
178
 The `dependencies` tag just installs dependencies, performing no other operations. The tasks associated with the `dependencies` tag do not rely on the user-provided settings that live in `group_vars/sovereign`. Running the playbook with the `dependencies` tag is particularly convenient for working with Docker images.
182
 The `dependencies` tag just installs dependencies, performing no other operations. The tasks associated with the `dependencies` tag do not rely on the user-provided settings that live in `group_vars/sovereign`. Running the playbook with the `dependencies` tag is particularly convenient for working with Docker images.
179
 
183
 
180
-### 6. Finish DNS set-up
184
+### 7. Finish DNS set-up
181
 
185
 
182
 Create an `MX` record for `example.com` which assigns `mail.example.com` as the domain’s mail server.
186
 Create an `MX` record for `example.com` which assigns `mail.example.com` as the domain’s mail server.
183
 
187
 
189
 
193
 
190
 Set up SPF and reverse DNS [as per this post](http://sealedabstract.com/code/nsa-proof-your-e-mail-in-2-hours/). Make sure to validate that it’s all working, for example by sending an email to <a href="mailto:check-auth@verifier.port25.com">check-auth@verifier.port25.com</a> and reviewing the report that will be emailed back to you.
194
 Set up SPF and reverse DNS [as per this post](http://sealedabstract.com/code/nsa-proof-your-e-mail-in-2-hours/). Make sure to validate that it’s all working, for example by sending an email to <a href="mailto:check-auth@verifier.port25.com">check-auth@verifier.port25.com</a> and reviewing the report that will be emailed back to you.
191
 
195
 
192
-### 7. Miscellaneous Configuration
196
+### 8. Miscellaneous Configuration
193
 
197
 
194
 Sign in to the ZNC web interface and set things up to your liking. It isn’t exposed through the firewall, so you must first set up an SSH tunnel:
198
 Sign in to the ZNC web interface and set things up to your liking. It isn’t exposed through the firewall, so you must first set up an SSH tunnel:
195
 
199
 

+ 1
- 0
roles/ircbouncer/defaults/main.yml Näytä tiedosto

1
+irc_timezone: "{{ common_timezone|default('Etc/UTC') }}"

+ 3
- 0
roles/news/handlers/main.yml Näytä tiedosto

1
+---
2
+- name: restart apache
3
+  service: name=apache2 state=restarted

Loading…
Peruuta
Tallenna