From 051bd2effd4f5f98320d0f5f0ef8e38e9aa7b0e5 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Mon, 3 Oct 2016 20:11:09 +0200 Subject: [PATCH] Auto commit without commit message --- .gitmodules | 6 ++++++ bin/debops-optimize | 7 ++++--- inventory | 2 +- playbooks/debops-contrib-playbooks | 2 +- roles/debops.apt | 2 +- roles/debops.apt_listchanges | 1 + roles/debops.apt_proxy | 1 + roles/debops.pki | 2 +- roles/debops.unattended_upgrades | 2 +- roles/debops.users | 2 +- roles/unverified_yet/debops.postgresql | 2 +- roles/unverified_yet/debops.postgresql_server | 2 +- roles_ypid/debops.cryptsetup | 2 +- submodules/debops | 2 +- template_role/docs/getting-started.rst | 3 +-- 15 files changed, 23 insertions(+), 15 deletions(-) create mode 160000 roles/debops.apt_listchanges create mode 160000 roles/debops.apt_proxy diff --git a/.gitmodules b/.gitmodules index 76b821e..9c01ead 100644 --- a/.gitmodules +++ b/.gitmodules @@ -521,3 +521,9 @@ [submodule "roles_ypid/debops.apache"] path = roles_ypid/debops.apache url = https://github.com/debops/ansible-apache.git +[submodule "roles/debops.apt_proxy"] + path = roles/debops.apt_proxy + url = https://github.com/debops/ansible-apt_proxy.git +[submodule "roles/debops.apt_listchanges"] + path = roles/debops.apt_listchanges + url = https://github.com/debops/ansible-apt_listchanges.git diff --git a/bin/debops-optimize b/bin/debops-optimize index 60a3d68..733f335 100755 --- a/bin/debops-optimize +++ b/bin/debops-optimize @@ -1,6 +1,6 @@ #!/bin/bash ## @license AGPLv3 -## @author Copyright (C) 2015 Robin Schneider +## @author Copyright (C) 2015-2016 Robin Schneider set -o nounset -o pipefail -o errexit @@ -130,6 +130,7 @@ git ls-files -z | xargs --null -I '{}' find '{}' -type f -print0 | \ git ls-files -z | xargs --null -I '{}' find '{}' -type f -executable -regextype posix-extended -regex '((:?defaults|tasks|meta|templates|handlers).*|.*\.(:?rst|md|txt))' -exec chmod -x {} \; ## Revert a change for the role itself because a self reference (currently points to GitHub) might be confusing. +## Also in preparation for: https://github.com/debops/docs/issues/212 git ls-files -z | xargs --null -I '{}' find '{}' -type f -regextype posix-extended -regex '(:?defaults/.*\.yml|.*\.rst)$' -print0 | \ xargs --null sed --in-place --regexp-extended " s/\b${role_full_name}_\b/\`\`${role_full_name}\`\`/g; @@ -138,13 +139,13 @@ git ls-files -z | xargs --null -I '{}' find '{}' -type f -regextype posix-extend ## Revert a change for deprecated roles (might be removed from the documentation at some point) or falsely detected roles. git ls-files -z | xargs --null -I '{}' find '{}' -type f -regextype posix-extended -regex '(:?defaults/.*\.yml|.*\.rst)$' -print0 | \ xargs --null sed --in-place --regexp-extended " - s/\b(debops\.(:?php5|sshkeys|cfg))_\b/\`\`\1\`\`/g; + s/\b(debops\.(:?php5|sshkeys|cfg)|ypid\.(:?crypttab))_\b/\`\`\1\`\`/g; " ## Revert other changes. git ls-files -z | xargs --null -I '{}' find '{}' -type f -regextype posix-extended -regex '(:?defaults/.*\.yml|.*\.rst)$' -print0 | \ xargs --null sed --in-place --regexp-extended ' - s/:envvar:`((:?bootstrap__admin_system_home|bootstrap__admin_name|bootstrap__admin_manage_existing|owncloud__enable_occ_shortcut|php__pool_default|php__version|inventory__host_environment|inventory__group_environment|inventory__environment|tinc__compression|tinc__connect_to_mesh0|owncloud__subdomain|apt__conditional_whitelist))`/``\1``/g; + s/:envvar:`((:?bootstrap__admin_system_home|bootstrap__admin_name|bootstrap__admin_manage_existing|owncloud__enable_occ_shortcut|php__pool_default|php__version|inventory__host_environment|inventory__group_environment|inventory__environment|tinc__compression|tinc__connect_to_mesh0|owncloud__subdomain|apt__conditional_whitelist|apt__proxy_bypass_for_bugs_debian_org|apt__sources_sections|apt__update_cache_early|apt__sources_types|apt__http_proxy_url|apt__https_proxy_url))`/``\1``/g; ' ## Revert changes only for debops-playbooks diff --git a/inventory b/inventory index fb97fb7..6799ff7 160000 --- a/inventory +++ b/inventory @@ -1 +1 @@ -Subproject commit fb97fb7f4a8d7dc45c5883dcd683cc1eeaaeee7e +Subproject commit 6799ff7a86de63e75af1a0931c9d93ea8529abdc diff --git a/playbooks/debops-contrib-playbooks b/playbooks/debops-contrib-playbooks index 96d99d4..a65203f 160000 --- a/playbooks/debops-contrib-playbooks +++ b/playbooks/debops-contrib-playbooks @@ -1 +1 @@ -Subproject commit 96d99d45254780111a148f2f7fee2831165ec97c +Subproject commit a65203f0d7939a7f24f16ee4aa774a83f6acbd36 diff --git a/roles/debops.apt b/roles/debops.apt index a886632..4766b1a 160000 --- a/roles/debops.apt +++ b/roles/debops.apt @@ -1 +1 @@ -Subproject commit a8866324093884616503d61b364a5667190c6843 +Subproject commit 4766b1abc340a705759643420d43376167f0ee60 diff --git a/roles/debops.apt_listchanges b/roles/debops.apt_listchanges new file mode 160000 index 0000000..7530368 --- /dev/null +++ b/roles/debops.apt_listchanges @@ -0,0 +1 @@ +Subproject commit 753036860172954a8d883d2a33fb0eb63f2d4029 diff --git a/roles/debops.apt_proxy b/roles/debops.apt_proxy new file mode 160000 index 0000000..5079dae --- /dev/null +++ b/roles/debops.apt_proxy @@ -0,0 +1 @@ +Subproject commit 5079dae9a7ad4f7c5094e44ab86446258d54339e diff --git a/roles/debops.pki b/roles/debops.pki index bd6001b..4a7fe58 160000 --- a/roles/debops.pki +++ b/roles/debops.pki @@ -1 +1 @@ -Subproject commit bd6001b0020b966288c09590c9cf766806aab9c8 +Subproject commit 4a7fe58bbd305a59105649abe747beb53984b02a diff --git a/roles/debops.unattended_upgrades b/roles/debops.unattended_upgrades index f62900d..7c8afa3 160000 --- a/roles/debops.unattended_upgrades +++ b/roles/debops.unattended_upgrades @@ -1 +1 @@ -Subproject commit f62900d2400fb28497adc7944a69df31131dfab1 +Subproject commit 7c8afa3e259e3eb7972e1e4acd30b86904630a2a diff --git a/roles/debops.users b/roles/debops.users index 3e40b7b..00f1d68 160000 --- a/roles/debops.users +++ b/roles/debops.users @@ -1 +1 @@ -Subproject commit 3e40b7bc297e222eca2e75bc087bc50d61980f13 +Subproject commit 00f1d680a3ea560c9cb45e461fb431f6eba6fada diff --git a/roles/unverified_yet/debops.postgresql b/roles/unverified_yet/debops.postgresql index 91dc22f..dd78dba 160000 --- a/roles/unverified_yet/debops.postgresql +++ b/roles/unverified_yet/debops.postgresql @@ -1 +1 @@ -Subproject commit 91dc22f64c555c19b378db347249ac254ca6f5bb +Subproject commit dd78dbaa734feb54bc9f1028f01527a72c9d7594 diff --git a/roles/unverified_yet/debops.postgresql_server b/roles/unverified_yet/debops.postgresql_server index b4dd8c2..090b27f 160000 --- a/roles/unverified_yet/debops.postgresql_server +++ b/roles/unverified_yet/debops.postgresql_server @@ -1 +1 @@ -Subproject commit b4dd8c2a2e5725280083959de8f6de8f98653335 +Subproject commit 090b27f897039d518de62542088d7a0027c4d0d6 diff --git a/roles_ypid/debops.cryptsetup b/roles_ypid/debops.cryptsetup index f6c7334..5e4789c 160000 --- a/roles_ypid/debops.cryptsetup +++ b/roles_ypid/debops.cryptsetup @@ -1 +1 @@ -Subproject commit f6c7334fd7f00684bc4fe0bed5885c0168a3f4f2 +Subproject commit 5e4789c6d12d9843e1338f59c7ba7858a952cade diff --git a/submodules/debops b/submodules/debops index 60f86d9..6994270 160000 --- a/submodules/debops +++ b/submodules/debops @@ -1 +1 @@ -Subproject commit 60f86d9293b584a779775f2b4fdbcc918caea24f +Subproject commit 6994270a08fa2ba125444a3d678610126ebe5d8c diff --git a/template_role/docs/getting-started.rst b/template_role/docs/getting-started.rst index a6fa19f..3c851ed 100644 --- a/template_role/docs/getting-started.rst +++ b/template_role/docs/getting-started.rst @@ -21,8 +21,7 @@ To manage `changeme/FIXME**, on a given host it should be included in the Example playbook ---------------- -If you are using this role without DebOps, here's an example Ansible playbook -that uses the ``ROLE_OWNER.ROLE_NAME`` role: +Here's an example playbook that uses the ``ROLE_OWNER.ROLE_NAME`` role: .. literalinclude:: playbooks/ROLE_NAME.yml :language: yaml