Skip to content

Commit 8a0d07c

Browse files
committed
Use semantic line breaks
1 parent fd42d8b commit 8a0d07c

File tree

2 files changed

+30
-71
lines changed

2 files changed

+30
-71
lines changed

CHANGELOG.rst

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ Unreleased
77
Deprecated
88
~~~~~~~~~~
99

10-
- Deprecate ``minecraft_supervisor_name`` in favour of
11-
``minecraft_service_name``.
10+
- Deprecate ``minecraft_supervisor_name`` in favour of ``minecraft_service_name``.
1211

1312
Fixed
1413
~~~~~
1514

16-
- When using ``curl`` to check the latest release, execute the task locally
17-
instead of on the remote host.
15+
- When using ``curl`` to check the latest release, execute the task locally instead of on the remote host.
1816

1917
3.1.0 (2016-12-10)
2018
------------------
@@ -44,11 +42,8 @@ Fixed
4442
Added
4543
~~~~~
4644

47-
- (`#5 <https://github.com/benwebber/ansible-minecraft/pull/5>`__)
48-
Manage ``server.properties`` by setting
49-
``minecraft_server_properties`` (Mark Côté).
50-
- (`#6 <https://github.com/benwebber/ansible-minecraft/issues/6>`__)
51-
Hooks: Include additional tasks at specific points during execution.
45+
- (`#5 <https://github.com/benwebber/ansible-minecraft/pull/5>`__) Manage ``server.properties`` by setting ``minecraft_server_properties`` (Mark Côté).
46+
- (`#6 <https://github.com/benwebber/ansible-minecraft/issues/6>`__) Hooks: Include additional tasks at specific points during execution.
5247

5348
Changed
5449
~~~~~~~
@@ -58,29 +53,25 @@ Changed
5853
Fixed
5954
~~~~~
6055

61-
- (`#4 <https://github.com/benwebber/ansible-minecraft/issues/4>`__)
62-
Improve build documentation.
56+
- (`#4 <https://github.com/benwebber/ansible-minecraft/issues/4>`__) Improve build documentation.
6357

6458
2.2.0 (2016-05-30)
6559
------------------
6660

6761
Added
6862
~~~~~
6963

70-
- It is now possible to install the latest major release of Minecraft
71-
using ``minecraft_version: latest``.
64+
- It is now possible to install the latest major release of Minecraft using ``minecraft_version: latest``.
7265

7366
Deprecated
7467
~~~~~~~~~~
7568

76-
- The hard-coded default version (currently ``1.9``) will be replaced
77-
with ``latest`` in the next major version.
69+
- The hard-coded default version (currently ``1.9``) will be replaced with ``latest`` in the next major version.
7870

7971
Fixed
8072
~~~~~
8173

82-
- Only generate ACL JSON files if the variables (e.g.,
83-
``minecraft_ops``) are non-empty.
74+
- Only generate ACL JSON files if the variables (e.g., ``minecraft_ops``) are non-empty.
8475
- Resolve deprecation warnings.
8576

8677
2.1.1 (2016-03-08)
@@ -118,8 +109,7 @@ Changed
118109
~~~~~~~
119110

120111
- Install latest 1.9 release by default.
121-
- Change default process supervisor (``minecraft_process_control``)
122-
from ``supervisor`` to ``systemd``.
112+
- Change default process supervisor (``minecraft_process_control``) from ``supervisor`` to ``systemd``.
123113

124114
1.4.0 (2016-01-23)
125115
------------------
@@ -148,14 +138,12 @@ Added
148138
Deprecated
149139
----------
150140

151-
- The default process supervisor (``minecraft_process_control``) will
152-
change from ``supervisor`` to ``systemd`` in the next major version.
141+
- The default process supervisor (``minecraft_process_control``) will change from ``supervisor`` to ``systemd`` in the next major version.
153142

154143
Fixed
155144
-----
156145

157-
- Configure Supervisor to run Java with absolute path
158-
(``/usr/bin/java``).
146+
- Configure Supervisor to run Java with absolute path (``/usr/bin/java``).
159147
- Add RHEL/CentOS to supported platforms on Ansible Galaxy.
160148

161149
1.2.0 (2015-11-26)
@@ -169,8 +157,7 @@ Added
169157
Fixed
170158
-----
171159

172-
- Create ``/run/minecraft`` directory properly using
173-
``systemd-tmpfiles``
160+
- Create ``/run/minecraft`` directory properly using ``systemd-tmpfiles``
174161
- Fix socket permissions for systemd < 214.
175162
- Do not update apt cache.
176163
- Download server before starting the service for the first time.

README.rst

Lines changed: 18 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,15 @@ ansible-minecraft
33

44
|Build Status|
55

6-
This role installs vanilla `Minecraft <https://minecraft.net/>`__ and
7-
configures it to run under
8-
`systemd <https://wiki.freedesktop.org/www/Software/systemd/>`__ or
9-
`Supervisor <http://supervisord.org/>`__.
6+
This role installs vanilla `Minecraft <https://minecraft.net/>`__ and configures it to run under `systemd <https://wiki.freedesktop.org/www/Software/systemd/>`__ or `Supervisor <http://supervisord.org/>`__.
107

11-
**If you're viewing this at
12-
https://github.com/benwebber/ansible-minecraft/, you're reading the
13-
documentation for the master branch. `View documentation for the latest
14-
release
15-
(3.0.0). <https://github.com/benwebber/ansible-minecraft/tree/v3.0.0#ansible-minecraft>`__**
8+
**If you're viewing this at https://github.com/benwebber/ansible-minecraft/, you're reading the documentation for the master branch. `View documentation for the latest release (3.0.0). <https://github.com/benwebber/ansible-minecraft/tree/v3.0.0#ansible-minecraft>`__**
169

1710
Requirements
1811
------------
1912

20-
- **Optional:** Python 2.7 on the Ansible control machine to generate
21-
user ACLs
22-
- **Optional:** Ansible 2.0.2+ or ``curl`` on the control machine to
23-
fetch the latest Minecraft version
13+
- **Optional:** Python 2.7 on the Ansible control machine to generate user ACLs
14+
- **Optional:** Ansible 2.0.2+ or ``curl`` on the control machine to fetch the latest Minecraft version
2415

2516
Features
2617
--------
@@ -40,11 +31,8 @@ Features
4031
| CentOS 7 | ||
4132
+----------------+--------------+-----------+
4233

43-
- safely stops the server using
44-
`stop <http://minecraft.gamepedia.com/Commands#stop>`__ when
45-
running under **systemd**
46-
- uses `Docker <https://www.docker.com/>`__ and
47-
`Serverspec <http://serverspec.org/>`__ to run integration tests
34+
- safely stops the server using `stop <http://minecraft.gamepedia.com/Commands#stop>`__ when running under **systemd**
35+
- uses `Docker <https://www.docker.com/>`__ and `Serverspec <http://serverspec.org/>`__ to run integration tests
4836
- manages user ACLs
4937
- manages ``server.properties``
5038
- hooks: include arbitrary tasks at specific stages during execution
@@ -54,13 +42,10 @@ Versioning
5442

5543
This project follows `semantic versioning <http://semver.org/>`__.
5644

57-
In the context of semantic versioning, consider the role contract to be
58-
defined by the role variables.
45+
In the context of semantic versioning, consider the role contract to be defined by the role variables.
5946

60-
- Changes that require user intervention will increase the **major**
61-
version. This includes changing the default value of a role variable.
62-
- Changes that do not require user intervention, but add
63-
backwards-compatible features, will increase the **minor** version.
47+
- Changes that require user intervention will increase the **major** version. This includes changing the default value of a role variable.
48+
- Changes that do not require user intervention, but add backwards-compatible features, will increase the **minor** version.
6449
- Bug fixes will increase the **patch** version.
6550

6651
Refer to the `change log <CHANGELOG.rst>`__ for upcoming changes.
@@ -102,12 +87,10 @@ The following variable defaults are defined in ``defaults/main.yml``.
10287
Java initial memory (``-Xms``) to allocate (default: ``1024M``)
10388

10489
``minecraft_service_name``
105-
systemd service name or Supervisor program name (default:
106-
``minecraft``)
90+
systemd service name or Supervisor program name (default: ``minecraft``)
10791

10892
``minecraft_supervisor_name``
109-
**DEPRECATED:** Supervisor program name (default:
110-
``{{ minecraft_service_name }}``)
93+
**DEPRECATED:** Supervisor program name (default: ``{{ minecraft_service_name }}``)
11194

11295
``minecraft_process_control``
11396
Choose between ``systemd`` and ``supervisor`` (default: ``systemd``).
@@ -125,8 +108,7 @@ The following variable defaults are defined in ``defaults/main.yml``.
125108
list of IP addresses to ban (default: ``[]``)
126109

127110
``minecraft_server_properties``
128-
dictionary of server.properties entries (e.g. ``server-port: 25565``)
129-
to set (default: ``{}``)
111+
dictionary of server.properties entries (e.g. ``server-port: 25565``) to set (default: ``{}``)
130112

131113
Hooks and run stages
132114
--------------------
@@ -154,10 +136,7 @@ Hooks and run stages
154136
``start``
155137
- (re)start server
156138

157-
You can execute custom tasks before or after specific stages. Simply
158-
specify a `task include
159-
file <https://docs.ansible.com/ansible/playbooks_roles.html#task-include-files-and-encouraging-reuse>`__
160-
using the relevant role variable:
139+
You can execute custom tasks before or after specific stages. Simply specify a `task include file <https://docs.ansible.com/ansible/playbooks_roles.html#task-include-files-and-encouraging-reuse>`__ using the relevant role variable:
161140

162141
.. code:: yaml
163142
@@ -204,25 +183,22 @@ Example
204183
Contributing
205184
------------
206185

207-
Pull requests are welcome. Among other features, this role lacks support
208-
for custom Minecraft servers.
186+
Pull requests are welcome. Among other features, this role lacks support for custom Minecraft servers.
209187

210188
Testing
211189
~~~~~~~
212190

213191
This role includes a Docker-based test harness for integration testing.
214192

215-
1. Install `Docker <https://docs.docker.com/engine/installation/>`__ and
216-
`Docker Compose <https://docs.docker.com/compose/>`__.
193+
1. Install `Docker <https://docs.docker.com/engine/installation/>`__ and `Docker Compose <https://docs.docker.com/compose/>`__.
217194

218195
2. Run tests with ``make``.
219196

220197
::
221198

222199
make jessie64 test
223200

224-
Integration tests use **systemd** by default. Set ``PROCESS_CONTROL`` to
225-
change this:
201+
Integration tests use **systemd** by default. Set ``PROCESS_CONTROL`` to change this:
226202

227203
::
228204

@@ -238,10 +214,6 @@ Apache 2.0
238214
Disclaimer
239215
----------
240216

241-
To automate the installation, this role automatically accepts the
242-
`Minecraft
243-
EULA <https://account.mojang.com/documents/minecraft_eula>`__. Be aware
244-
that by using this role, you implicitly accept the same EULA.
217+
To automate the installation, this role automatically accepts the `Minecraft EULA <https://account.mojang.com/documents/minecraft_eula>`__. Be aware that by using this role, you implicitly accept the same EULA.
245218

246-
.. |Build Status| image:: https://travis-ci.org/benwebber/ansible-minecraft.svg?branch=master
247-
:target: https://travis-ci.org/benwebber/ansible-minecraft
219+
.. |Build Status| image:: https://travis-ci.org/benwebber/ansible-minecraft.svg?branch=master :target: https://travis-ci.org/benwebber/ansible-minecraft

0 commit comments

Comments
 (0)