diff --git a/bundles/apt/items.py b/bundles/apt/items.py index 0788a87..a8da430 100644 --- a/bundles/apt/items.py +++ b/bundles/apt/items.py @@ -23,12 +23,12 @@ directories = { 'action:apt_update', }, }, - '/etc/apt/listchanges.conf.d': { - 'purge': True, - 'triggers': { - 'action:apt_update', - }, - }, + # '/etc/apt/listchanges.conf.d': { + # 'purge': True, + # 'triggers': { + # 'action:apt_update', + # }, + # }, '/etc/apt/preferences.d': { 'purge': True, 'triggers': { @@ -56,9 +56,9 @@ files = { 'action:apt_update', }, }, - '/etc/apt/listchanges.conf': { - 'content': repo.libs.ini.dumps(node.metadata.get('apt/list_changes')), - }, + # '/etc/apt/listchanges.conf': { + # 'content': repo.libs.ini.dumps(node.metadata.get('apt/list_changes')), + # }, '/usr/lib/nagios/plugins/check_apt_upgradable': { 'mode': '0755', }, diff --git a/bundles/apt/metadata.py b/bundles/apt/metadata.py index 1906721..db37cb4 100644 --- a/bundles/apt/metadata.py +++ b/bundles/apt/metadata.py @@ -1,5 +1,10 @@ defaults = { 'apt': { + 'packages': { + 'apt-listchanges': { + 'installed': False, + }, + }, 'config': { 'DPkg': { 'Pre-Install-Pkgs': { @@ -125,45 +130,45 @@ def unattended_upgrades(metadata): } -@metadata_reactor.provides( - 'apt/config', - 'apt/list_changes', -) -def listchanges(metadata): - return { - 'apt': { - 'config': { - 'DPkg': { - 'Pre-Install-Pkgs': { - '/usr/bin/apt-listchanges --apt || test $? -lt 10', - }, - 'Tools': { - 'Options': { - '/usr/bin/apt-listchanges': { - 'Version': '2', - 'InfoFD': '20', - }, - }, - }, - }, - 'Dir': { - 'Etc': { - 'apt-listchanges-main': 'listchanges.conf', - 'apt-listchanges-parts': 'listchanges.conf.d', - }, - }, - }, - 'list_changes': { - 'apt': { - 'frontend': 'pager', - 'which': 'news', - 'email_address': 'root', - 'email_format': 'text', - 'confirm': 'false', - 'headers': 'false', - 'reverse': 'false', - 'save_seen': '/var/lib/apt/listchanges.db', - }, - }, - }, - } +# @metadata_reactor.provides( +# 'apt/config', +# 'apt/list_changes', +# ) +# def listchanges(metadata): +# return { +# 'apt': { +# 'config': { +# 'DPkg': { +# 'Pre-Install-Pkgs': { +# '/usr/bin/apt-listchanges --apt || test $? -lt 10', +# }, +# 'Tools': { +# 'Options': { +# '/usr/bin/apt-listchanges': { +# 'Version': '2', +# 'InfoFD': '20', +# }, +# }, +# }, +# }, +# 'Dir': { +# 'Etc': { +# 'apt-listchanges-main': 'listchanges.conf', +# 'apt-listchanges-parts': 'listchanges.conf.d', +# }, +# }, +# }, +# 'list_changes': { +# 'apt': { +# 'frontend': 'pager', +# 'which': 'news', +# 'email_address': 'root', +# 'email_format': 'text', +# 'confirm': 'false', +# 'headers': 'false', +# 'reverse': 'false', +# 'save_seen': '/var/lib/apt/listchanges.db', +# }, +# }, +# }, +# }