Fabio/hassio-supervised-installer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Simplify AppArmor handler with new OS-Agent (#165)

Browse source 
* Simplify AppArmor handler with new OS-Agent

* improve grammar

* bump version number

Co-authored-by: Matheson Steplock <ikifar2012@users.noreply.github.com>
This commit is contained in:
Pascal Vizeli 2021-11-02 18:43:02 +01:00 committed by GitHub
parent d15efe7eeb
commit cf37577f61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
homeassistant-supervised/DEBIAN/control
View file

@ -1,6 +1,6 @@
Package: homeassistant-supervised Package: homeassistant-supervised
Section: base Section: base
Version: 1.0.1 Version: 1.0.2
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends: curl, bash, docker-ce, dbus, network-manager, apparmor, jq, systemd, os-agent Depends: curl, bash, docker-ce, dbus, network-manager, apparmor, jq, systemd, os-agent

25
homeassistant-supervised/usr/sbin/hassio-apparmor
View file

@ -8,20 +8,12 @@ CONFIG_FILE=%%HASSIO_CONFIG%%
DATA="$(jq --raw-output '.data // "/usr/share/hassio"' ${CONFIG_FILE})" DATA="$(jq --raw-output '.data // "/usr/share/hassio"' ${CONFIG_FILE})"
PROFILES_DIR="${DATA}/apparmor" PROFILES_DIR="${DATA}/apparmor"
CACHE_DIR="${PROFILES_DIR}/cache" CACHE_DIR="${PROFILES_DIR}/cache"
REMOVE_DIR="${PROFILES_DIR}/remove"
# Exists AppArmor
if ! command -v apparmor_parser > /dev/null 2>&1; then
echo "[Warning]: No apparmor_parser on host system!"
exit 0
fi
# Check folder structure # Check folder structure
mkdir -p "${PROFILES_DIR}" mkdir -p "${PROFILES_DIR}"
mkdir -p "${CACHE_DIR}" mkdir -p "${CACHE_DIR}"
mkdir -p "${REMOVE_DIR}"
# Load/Update exists/new profiles # Load existing profiles
for profile in "${PROFILES_DIR}"/*; do for profile in "${PROFILES_DIR}"/*; do
if [ ! -f "${profile}" ]; then if [ ! -f "${profile}" ]; then
continue continue
@ -32,18 +24,3 @@ for profile in "${PROFILES_DIR}"/*; do
echo "[Error]: Can't load profile ${profile}" echo "[Error]: Can't load profile ${profile}"
fi fi
done done
# Cleanup old profiles
for profile in "${REMOVE_DIR}"/*; do
if [ ! -f "${profile}" ]; then
continue
fi
# Unload Profile
if apparmor_parser -R -W -L "${CACHE_DIR}" "${profile}"; then
if rm -f "${profile}"; then
continue
fi
fi
echo "[Error]: Can't remove profile ${profile}"
done