Auto commit without commit message

ypid · Sep 22, 2016 · 5812e6e · 5812e6e
1 parent 144d7c6
commit 5812e6e
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 33 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -53,7 +53,7 @@
 	path = roles/debops.ifupdown
 	url = https://github.com/debops/ansible-ifupdown.git
 [submodule "debops.librenms"]
-	path = roles/debops.librenms
+	path = roles/unverified_yet/debops.librenms
 	url = https://github.com/debops/ansible-librenms.git
 [submodule "debops.lxc"]
 	path = roles/debops.lxc
@@ -179,7 +179,7 @@
 	path = roles/debops.subnetwork
 	url = https://github.com/debops/ansible-subnetwork.git
 [submodule "playbooks/ansible-os-hardening"]
-	path = roles/hardening.os-hardening
+	path = roles/dev-sec.os-hardening
 	url = https://github.com/hardening-io/ansible-os-hardening.git
 [submodule "playbooks/debops-playbooks"]
 	path = submodules/debops-playbooks
@@ -302,7 +302,7 @@
 	path = roles/debops-contrib.checkmk_agent
 	url = https://github.com/debops-contrib/ansible-checkmk_agent.git
 [submodule "roles/hardening.ssh-hardening"]
-	path = roles/hardening.ssh-hardening
+	path = roles/dev-sec.ssh-hardening
 	url = https://github.com/hardening-io/ansible-ssh-hardening.git
 [submodule "submodules/ansible-qubes"]
 	path = submodules/ansible-qubes
@@ -515,3 +515,6 @@
 [submodule "inventory"]
 	path = inventory
 	url = https://github.com/ypid/ypid-ansible-inventory.git
+[submodule "roles/dev-sec.apache-hardening"]
+	path = roles/dev-sec.apache-hardening
+	url = https://github.com/dev-sec/ansible-apache-hardening.git
diff --git a/bin/debops-optimize b/bin/debops-optimize
@@ -72,7 +72,7 @@ git ls-files -z | xargs --null -I '{}' find '{}' -type f -regextype posix-extend
 		s/`([[:alnum:]_-]+\.[[:alnum:]_-]+)`_/\1_/g;
 		s/``(debops\.[[:alnum:]_-]+)``/\1_/g;
 		s/``(ypid\.[[:alnum:]_-]+)``/\1_/g;
-		s/([^[:alnum:]`@_]\b(:?drybjed|ypid|ganto|htgoebel|nickjj|scibi|do3cc|AnBuKu|thiagotalma|jacksingleton|ser|yuvadm|pedroluislopez|patrickheeney|le9i0nx))([^[:alnum:]\/@_.>-])/\1_\3/g;
+		s/([^[:alnum:]`@_]\b(:?drybjed|ypid|ganto|htgoebel|nickjj|scibi|do3cc|AnBuKu|thiagotalma|jacksingleton|ser|yuvadm|pedroluislopez|patrickheeney|le9i0nx))([^[:alnum:]\/@_.>:-])/\1_\3/g;
 		s/\*\*(drybjed|ypid|ganto|htgoebel|nickjj|scibi|do3cc|AnBuKu|thiagotalma|jacksingleton|ser|yuvadm|pedroluislopez|patrickheeney|le9i0nx)\*\*/\1_/g;
 		s/([^`])(debops tools)([^`/ ])/\1`DebOps Tools`_\3/gi;
 		s/The current role maintainer is/The current role maintainer_ is/gi;

diff --git a/playbooks/ypid-playbooks/service/ssh-hardening.yml b/playbooks/ypid-playbooks/service/ssh-hardening.yml
@@ -6,5 +6,5 @@
 
   roles:
 
-    - role: hardening.ssh-hardening
+    - role: dev-sec.ssh-hardening
       tags: [ 'role::ssh-hardening' ]
diff --git a/roles/debops.ferm b/roles/debops.ferm
diff --git a/roles/debops.librenms b/roles/debops.librenms
diff --git a/roles/debops.nginx b/roles/debops.nginx
diff --git a/roles/debops.owncloud b/roles/debops.owncloud
diff --git a/roles/debops.pki b/roles/debops.pki
diff --git a/roles/debops.redis b/roles/debops.redis
diff --git a/roles/debops.tinc b/roles/debops.tinc
diff --git a/roles/debops.unattended_upgrades b/roles/debops.unattended_upgrades
diff --git a/roles/dev-sec.apache-hardening b/roles/dev-sec.apache-hardening
diff --git a/roles/hardening.os-hardening → roles/dev-sec.os-hardening b/roles/hardening.os-hardening → roles/dev-sec.os-hardening
diff --git a/roles/hardening.ssh-hardening → roles/dev-sec.ssh-hardening b/roles/hardening.ssh-hardening → roles/dev-sec.ssh-hardening
diff --git a/roles/nusenu.relayor b/roles/nusenu.relayor
diff --git a/roles/unverified_yet/debops.librenms b/roles/unverified_yet/debops.librenms
diff --git a/roles_ypid/ypid.kernel_module b/roles_ypid/ypid.kernel_module
diff --git a/submodules/debops-keyring b/submodules/debops-keyring
diff --git a/template_role/docs/getting-started.rst b/template_role/docs/getting-started.rst
@@ -10,8 +10,8 @@ Getting started
 Example inventory
 -----------------
 
-To `changeme/FIXME**, add the hosts to the
-``debops_service_ROLE_NAME`` Ansible inventory host group:
+To manage `changeme/FIXME**, on a given host it should be included in the
+``debops_service_ROLE_NAME`` Ansible inventory group:
 
 .. code:: ini
 
@@ -21,8 +21,6 @@ To `changeme/FIXME**, add the hosts to the
 Example playbook
 ----------------
 
-Here's an example playbook that can be used to `changeme/FIXME** on a set of hosts:
-
 If you are using this role without DebOps, here's an example Ansible playbook
 that uses the ``ROLE_OWNER.ROLE_NAME`` role:
 
@@ -52,6 +50,6 @@ Available role tags:
   Main role tag, should be used in the playbook to execute all of the role
   tasks as well as role dependencies.
 
-``role::ROLE_NAME:pkg``
-  Tasks related to system package management like installing, upgrading or
+``role::ROLE_NAME:pkgs``
+  Tasks related to system package management like installing or
   removing packages.
diff --git a/template_role/docs/introduction.rst b/template_role/docs/introduction.rst
@@ -3,7 +3,7 @@ Introduction
 
 .. include:: includes/all.rst
 
-The ``ROLE_OWNER.ROLE_NAME`` role allows you to setup and mange
+The ``ROLE_OWNER.ROLE_NAME`` role allows you to manage and configure
 
 
 Installation

diff --git a/template_role/meta/ansigenome.yml b/template_role/meta/ansigenome.yml
@@ -10,10 +10,9 @@ ansigenome_info:
   license_url: 'https://tldrlegal.com/license/gnu-general-public-license-v3-(gpl-3)'
 
   authors:
+
     - name:  'Robin Schneider'
-      url: 'http://ypid.de/'
       email: '[email protected]'
-      twitter: 'ypid'
       github: 'ypid'
 
   synopsis: |
diff --git a/template_role/meta/main.yml b/template_role/meta/main.yml
@@ -6,9 +6,9 @@ galaxy_info:
 
   company: 'DebOps'
   author: 'Robin Schneider'
-  description: 'FIXME.'
+  description: 'FIXME'
   license: 'GPL-3.0'
-  min_ansible_version: '1.9.0'
+  min_ansible_version: '2.0.0'
 
   platforms:
 
@@ -20,10 +20,8 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - precise
-        - quantal
-        - raring
-        - saucy
         - trusty
+        - xenial
 
   galaxy_tags:
     - encryption

diff --git a/template_role/tasks/main.yml b/template_role/tasks/main.yml
@@ -1,10 +1,8 @@
 ---
 
 - name: Ensure specified packages are in there desired state
-  apt:
+  package:
     name: '{{ item }}'
     state: '{{ "present" if (ROLE_NAME__deploy_state == "present") else "absent" }}'
-    install_recommends: False
-    purge: True
   with_flattened: '{{ ROLE_NAME__base_packages }}'
   tags: [ 'role::ROLE_NAME:pkts' ]
+8 −0		CHANGES.rst
+18 −2		defaults/main.yml
+12 −12		docs/defaults-detailed.rst
+2 −3		handlers/main.yml
+6 −7		tasks/nginx_servers.yml
+4 −2		templates/etc/nginx/sites-available/default.conf.j2
+2 −2		README.md
+10 −6		docs/acme-integration.rst
+0 −3		meta/ansigenome.yml
+3 −1		tasks/main.yml
+45 −23		templates/etc/ansible/facts.d/pki.fact.j2
+0 −22		tasks/linux_service.yml
+20 −0		tasks/rpm_install.yml
+16 −1		CHANGES.rst
+9 −2		README.rst
+ −		debops-keyring-gpg/0xDAA9DC5E750C1E85
+1 −0		keyids
+1 −0		roles/contributors