-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
15 changed files
with
23 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
||
|
@@ -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 | ||
|
Submodule inventory
updated
1 files
+25 −0 | group_vars/all/public_debops_common/public_paranoid_debops_nginx.yml |
Submodule debops-contrib-playbooks
updated
8 files
+4 −0 | service/apparmor.yml | |
+4 −0 | service/btrfs.yml | |
+4 −0 | service/checkmk_agent.yml | |
+4 −0 | service/etckeeper.yml | |
+5 −1 | service/foodsoft.yml | |
+4 −0 | service/fuse.yml | |
+4 −0 | service/snapshot_snapper.yml | |
+4 −0 | service/x2go_server.yml |
Submodule debops.apt
updated
24 files
+104 −5 | CHANGES.rst | |
+28 −10 | UPGRADE.rst | |
+208 −270 | defaults/main.yml | |
+323 −0 | docs/defaults-detailed.rst | |
+22 −4 | docs/getting-started.rst | |
+1 −0 | docs/index.rst | |
+0 −148 | tasks/apt.yml | |
+132 −34 | tasks/main.yml | |
+0 −33 | tasks/update_notifications.yml | |
+92 −3 | templates/etc/ansible/facts.d/apt.fact.j2 | |
+0 −17 | templates/etc/apt/apt.conf.d/000apt-cacher-ng-proxy.j2 | |
+6 −5 | templates/etc/apt/apt.conf.d/25no-recommends.conf.j2 | |
+0 −10 | templates/etc/apt/apt.conf.d/70aptitude.j2 | |
+0 −21 | templates/etc/apt/listchanges.conf.j2 | |
+103 −76 | templates/etc/apt/sources.list.j2 | |
+0 −88 | templates/etc/apticron/apticron.conf.j2 | |
+0 −5 | vars/apt__default_mirrors.yml | |
+0 −6 | vars/apt__default_mirrors_debian.yml | |
+0 −5 | vars/apt__default_mirrors_raspbian.yml | |
+0 −5 | vars/apt__default_mirrors_ubuntu.yml | |
+0 −6 | vars/apt__default_sources.yml | |
+0 −21 | vars/apt__default_sources_debian.yml | |
+0 −17 | vars/apt__default_sources_raspbian.yml | |
+0 −32 | vars/apt__default_sources_ubuntu.yml |
Submodule debops.apt_listchanges
added at
753036
Submodule debops.apt_proxy
added at
5079da
Submodule debops.pki
updated
6 files
+2 −0 | CHANGES.rst | |
+9 −0 | defaults/main.yml | |
+3 −3 | docs/external-certificates.rst | |
+1 −1 | files/secret/pki/lib/pki-authority | |
+1 −1 | files/usr/local/lib/pki/pki-realm | |
+1 −2 | tasks/main.yml |
Submodule debops.users
updated
from 3e40b7 to 00f1d6
Submodule debops.postgresql
updated
from 91dc22 to dd78db
Submodule debops.postgresql_server
updated
from b4dd8c to 090b27
Submodule debops.cryptsetup
updated
from f6c733 to 5e4789
Submodule debops
updated
3 files
+32 −23 | bin/debops-update | |
+1 −1 | docs/scripts/debops-task.rst | |
+14 −0 | docs/scripts/debops-update.rst |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters