Skip to content

Commit

Permalink
Auto commit without commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
ypid committed Oct 3, 2016
1 parent e1adaf2 commit 051bd2e
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 15 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions bin/debops-optimize
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
## @license AGPLv3 <https://www.gnu.org/licenses/agpl-3.0.html>
## @author Copyright (C) 2015 Robin Schneider <[email protected]>
## @author Copyright (C) 2015-2016 Robin Schneider <[email protected]>

set -o nounset -o pipefail -o errexit

Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion inventory
1 change: 1 addition & 0 deletions roles/debops.apt_listchanges
Submodule debops.apt_listchanges added at 753036
1 change: 1 addition & 0 deletions roles/debops.apt_proxy
Submodule debops.apt_proxy added at 5079da
2 changes: 1 addition & 1 deletion roles/debops.unattended_upgrades
2 changes: 1 addition & 1 deletion roles/debops.users
2 changes: 1 addition & 1 deletion roles/unverified_yet/debops.postgresql
2 changes: 1 addition & 1 deletion roles/unverified_yet/debops.postgresql_server
2 changes: 1 addition & 1 deletion roles_ypid/debops.cryptsetup
2 changes: 1 addition & 1 deletion submodules/debops
3 changes: 1 addition & 2 deletions template_role/docs/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 051bd2e

Please sign in to comment.