From c56188623e83f8e59b88a14d41d513d386af6c64 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 13 Mar 2016 16:31:44 +0200
Subject: [PATCH] - Added pre-commit hooks. - Cleaned and updated README.
---
.pre-commit-config.yaml | 7 ++++++-
README.rst | 18 ++++++++++++++----
collectd/collectd_facts | 0
3 files changed, 20 insertions(+), 5 deletions(-)
mode change 100644 => 100755 collectd/collectd_facts
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3a2aa9e..5c39617 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
- repo: git://github.com/pre-commit/pre-commit-hooks
- sha: cf550fcab3f12015f8676b8278b30e1a5bc10e70
+ sha: 97b88d9610bcc03982ddac33caba98bb2b751f5f
hooks:
- id: check-added-large-files
- id: check-json
@@ -7,3 +7,8 @@
- id: check-yaml
- id: check-merge-conflict
- id: flake8
+- repo: https://www.shore.co.il/git/shell-pre-commit
+ sha: e48c7fbdadf14a548dcbda32895b67f90fa0f12b
+ hooks:
+ - id: shell-lint
+ files: collectd/collectd_facts|nginx/nginx_facts|ssl/dhparams
diff --git a/README.rst b/README.rst
index 7cd7cfd..becbe54 100644
--- a/README.rst
+++ b/README.rst
@@ -13,7 +13,8 @@ at the root of the playbooks directory
mkdir library
touch library/__init__.py
- git submodule add https://www.shore.co.il/cgit/ansible-modules library/shore
+ git submodule add https://www.shore.co.il/git/ansible-modules library/shore master
+ sudo pip install -r library/shore/requirements.txt
To update the submodule
@@ -26,12 +27,21 @@ Remember to commit :code:`.gitmodules`!
Modules
-------
-- <placeholder>
+- collectd_facts
+- ldap_attr
+- nginx_facts
+- dhparams
License
-------
-AGPL v3+
+This software is licensed under the AGPL v3+ license (see the
+:code:`LICENSE.txt` file).
+
+Testing
+-------
+
+Currently the only tests are `pre-commit <http://www.pre-commit.com/>`_ hooks.
Author
------
@@ -39,7 +49,7 @@ Author
Nimrod Adar, `contact me <nimrod@shore.co.il>`_ or visit my `website
<https://www.shore.co.il/>`_. Patches are welcome via `git send-email
<http://git-scm.com/book/en/v2/Git-Commands-Email>`_. The repository is located
-at: https://www.shore.co.il/cgit/.
+at: https://www.shore.co.il/git/.
TODO
----
diff --git a/collectd/collectd_facts b/collectd/collectd_facts
old mode 100644
new mode 100755
--
GitLab