diff --git a/bundles/apt/items.py b/bundles/apt/items.py index ae0f87a..639417d 100644 --- a/bundles/apt/items.py +++ b/bundles/apt/items.py @@ -143,6 +143,9 @@ pkg_apt = { 'cloud-init': { 'installed': False, }, + 'molly-guard': { + 'installed': False, + }, 'netplan.io': { 'installed': False, }, diff --git a/bundles/molly-guard/files/10-check-unattended-upgrades b/bundles/molly-guard/files/10-check-unattended-upgrades deleted file mode 100644 index 6adafdb..0000000 --- a/bundles/molly-guard/files/10-check-unattended-upgrades +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# Checks wether upgrade-and-reboot is currently running. - -if [[ -f "/var/lib/bundlewrap/soft-${node.name}/UNATTENDED" ]] -then - echo "Sorry, can't $MOLLYGUARD_CMD now, upgrade-and-reboot is running" - exit 1 -fi diff --git a/bundles/molly-guard/files/30-query-hostname b/bundles/molly-guard/files/30-query-hostname deleted file mode 100644 index 3e4fc4c..0000000 --- a/bundles/molly-guard/files/30-query-hostname +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -# This script will ask for the bundlewrap node name. This replaces the -# original script, which will ask for the hostname, which sometimes -# is not enough to properly identify the system. - -NODE_NAME="${node.name}" - -# If this is not a terminal, do nothing -test -t 0 || exit 0 - -sigh() -{ - echo "Sorry, input does not match. Won't $MOLLYGUARD_CMD $NODE_NAME ..." >&2 - exit 1 -} - -trap 'echo;sigh' 1 2 3 9 10 12 15 - -echo -n "Please enter the bundlewrap node name of this System to $MOLLYGUARD_CMD: " -read NODE_NAME_USER || : - -NODE_NAME_USER="$(echo "$NODE_NAME_USER" | tr '[:upper:]' '[:lower:]')" - -[ "$NODE_NAME_USER" = "$NODE_NAME" ] || sigh - -trap - 1 2 3 9 10 12 15 - -exit 0 diff --git a/bundles/molly-guard/files/rc b/bundles/molly-guard/files/rc deleted file mode 100644 index 4b6f808..0000000 --- a/bundles/molly-guard/files/rc +++ /dev/null @@ -1 +0,0 @@ -# currently unused diff --git a/bundles/molly-guard/items.py b/bundles/molly-guard/items.py deleted file mode 100644 index 1d6d82f..0000000 --- a/bundles/molly-guard/items.py +++ /dev/null @@ -1,27 +0,0 @@ -directories = { - '/etc/molly-guard/messages.d': { - 'purge': True, - 'after': { - 'pkg_apt:molly-guard', - }, - }, - '/etc/molly-guard/run.d': { - 'purge': True, - 'after': { - 'pkg_apt:molly-guard', - }, - }, -} - -files = { - '/etc/molly-guard/rc': {}, - - '/etc/molly-guard/run.d/10-check-unattended-upgrades': { - 'content_type': 'mako', - 'mode': '0755', - }, - '/etc/molly-guard/run.d/30-query-hostname': { - 'content_type': 'mako', - 'mode': '0755', - }, -} diff --git a/bundles/molly-guard/metadata.py b/bundles/molly-guard/metadata.py deleted file mode 100644 index d8571e2..0000000 --- a/bundles/molly-guard/metadata.py +++ /dev/null @@ -1,7 +0,0 @@ -defaults = { - 'apt': { - 'packages': { - 'molly-guard': {}, - }, - }, -}