瀏覽代碼

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

Add missing configuration parameter for ircbouncer
Allen Riddell 9 年之前
父節點
當前提交
6d5a2ff718
共有 3 個文件被更改,包括 15 次插入7 次删除
  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 查看文件

@@ -62,7 +62,11 @@ You do not need to acquire an SSL certificate.  The SSL certificates you need wi
62 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 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,7 +74,7 @@ Create a new machine key for your server:
70 74
 
71 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 79
 For goodness sake, change the root password:
76 80
 
@@ -93,7 +97,7 @@ Authorize your ssh key if you want passwordless ssh login (optional):
93 97
 
94 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 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 103
 All of the variables in `group_vars/sovereign` must be set for sovereign to function.
@@ -146,7 +150,7 @@ For Git hosting, copy your public key into place:
146 150
 
147 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 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,7 +165,7 @@ Create `A` or `CNAME` records which point to your server's IP address:
161 165
 * `cloud.example.com` (for ownCloud)
162 166
 * `git.example.com` (for cgit)
163 167
 
164
-### 5. Run the Ansible Playbooks
168
+### 6. Run the Ansible Playbooks
165 169
 
166 170
 First, make sure you’ve [got Ansible 1.9.3+ installed](http://docs.ansible.com/intro_installation.html#getting-ansible).
167 171
 
@@ -177,7 +181,7 @@ You might find that it fails at one point or another. This is probably because s
177 181
 
178 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 186
 Create an `MX` record for `example.com` which assigns `mail.example.com` as the domain’s mail server.
183 187
 
@@ -189,7 +193,7 @@ For DMARC you'll also need to add a `txt` record. The name field should be `_dma
189 193
 
190 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 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 查看文件

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

+ 3
- 0
roles/news/handlers/main.yml 查看文件

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

Loading…
取消
儲存