Skip to content

Commit 30046f5

Browse files
authored
Merge pull request #54 from ypid/rework-master
Rework master
2 parents a7ade18 + 2bd9a25 commit 30046f5

File tree

18 files changed

+326
-283
lines changed

18 files changed

+326
-283
lines changed

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,14 @@ tests/test_out.mk
99
Session.vim
1010
.netrwhist
1111
*~
12+
## For quick testing.
13+
## Generated by https://github.com/ypid/ypid-ansible-common/blob/master/bin/sphinx-debops-role-build
14+
docs/Makefile
15+
docs/_build/
16+
docs/conf.py
17+
docs/defaults.rst
18+
docs/includes/global.rst
19+
docs/_templates/page.html
20+
docs/_templates/.gitkeep
21+
docs/_static/custom.css
22+
docs/_static/.gitkeep

CHANGES.rst

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
Changelog
22
=========
33

4+
.. include:: includes/all.rst
5+
46
**debops-contrib.checkmk_server**
57

6-
This project adheres to `Semantic Versioning <http://semver.org/spec/v2.0.0.html>`_
7-
and `human-readable changelog <http://keepachangelog.com/>`_.
8+
This project adheres to `Semantic Versioning <http://semver.org/spec/v2.0.0.html>`__
9+
and `human-readable changelog <http://keepachangelog.com/en/0.3.0/>`__.
810

9-
The current role maintainer is ganto.
11+
The current role maintainer_ is ganto.
1012

1113

1214
debops-contrib.checkmk_server master - unreleased
@@ -15,4 +17,10 @@ debops-contrib.checkmk_server master - unreleased
1517
Added
1618
~~~~~
1719

18-
- Initial release [ganto]
20+
- Initial release [ganto_]
21+
22+
Fixed
23+
~~~~~
24+
25+
- Fix ``checkmk_server__ssh_command`` which would have been wrongly generated
26+
with ``checkmk_server__ssh_user`` set to ``root``. [ypid_]

COPYRIGHT

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
debops-contrib.checkmk_server - Manage Check_MK monitoring server
22

3-
Copyright (C) 2016 Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4-
Copyright (C) 2016 DebOps Project http://debops.org/
3+
Copyright (C) 2016-2017 Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
4+
Copyright (C) 2016-2017 DebOps https://debops.org/
55

66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU General Public License version 3, as
@@ -13,4 +13,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1313
General Public License for more details.
1414

1515
You should have received a copy of the GNU General Public License
16-
along with this program. If not, see http://www.gnu.org/licenses/
16+
along with this program. If not, see https://www.gnu.org/licenses/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This role installs and manages [Check_MK](http://mathias-kettner.com/check_mk.ht
2020

2121
### Installation
2222

23-
This role requires at least Ansible `v2.1.1`. To install it, run:
23+
This role requires at least Ansible `v2.1.5`. To install it, run:
2424

2525
```Shell
2626
ansible-galaxy install debops-contrib.checkmk_server

TODO

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
* Fix internal role namespace
3+
git ls-files -z "$(git rev-parse --show-toplevel)" | xargs --null -I '{}' find '{}' -type f -print0 | xargs --null sed --in-place --regexp-extended 's/\<(checkmk_server)_([^_])/\1__\2/g;'

0 commit comments

Comments
 (0)