From ebd7be4f18d03a5d1390366465a2fb75eb93bcf3 Mon Sep 17 00:00:00 2001
From: Fredrik Baberg <fredrik.baberg@gmail.com>
Date: Wed, 13 Nov 2024 12:09:20 +0100
Subject: [PATCH] Remove AppArmor, update OctoPrint version and version number
 (#113)

* Remove AppArmor, update OctoPrint version and version number

* Update changelog
---
 3dprinter-octoprint/CHANGELOG.md |  4 +++
 3dprinter-octoprint/apparmor.txt | 57 --------------------------------
 3dprinter-octoprint/build.yaml   |  2 +-
 3dprinter-octoprint/config.yaml  |  2 +-
 4 files changed, 6 insertions(+), 59 deletions(-)
 delete mode 100644 3dprinter-octoprint/apparmor.txt

diff --git a/3dprinter-octoprint/CHANGELOG.md b/3dprinter-octoprint/CHANGELOG.md
index 9cb16df..eccf760 100644
--- a/3dprinter-octoprint/CHANGELOG.md
+++ b/3dprinter-octoprint/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2024.11.0
+  * Remove AppArmor to make it run on HA Supervised
+  * Update default OctoPrint version to 1.10.3
+
 ## 2024.01.2
   * Add option to pass webcam URL to proxy.
 
diff --git a/3dprinter-octoprint/apparmor.txt b/3dprinter-octoprint/apparmor.txt
deleted file mode 100644
index d3480bc..0000000
--- a/3dprinter-octoprint/apparmor.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <tunables/global>
-
-profile 3dprinter-octoprint flags=(attach_disconnected,mediate_deleted) {
-  #include <abstractions/base>
-  
-  # Capabilities
-  file,
-  signal (send) set=(kill,term,int,hup,cont),
-  
-  # S6-Overlay
-  /init ix,
-  /bin/** ix,
-  /usr/bin/** ix,
-  /run/{s6,s6-rc*,service}/** ix,
-  /package/** ix,
-  /command/** ix,
-  /etc/services.d/** rwix,
-  /etc/cont-init.d/** rwix,
-  /etc/cont-finish.d/** rwix,
-  /run/{,**} rwk,
-  /dev/tty rw,
-  
-  # Bashio
-  /usr/lib/bashio/** ix,
-  /tmp/** rwk,
-  
-  # Access to options.json and other files within your addon
-  /data/** rw,
-  
-  # Start new profile for service
-  /usr/bin/caddy cx -> caddy,
-  
-  profile caddy flags=(attach_disconnected,mediate_deleted) {
-    #include <abstractions/base>
-
-    # Receive signals from S6-Overlay
-    signal (receive) peer=*_3dprinter-octoprint,
-
-    capability dac_override,
-
-    owner /usr/bin/caddy rm,
-    @{HOME}/.step/ w,
-    @{PROC}/*/cpuset r,
-    @{PROC}/sys/net/** r,
-
-    /etc/** r,
-    owner /etc/caddy/ kwr,
-    owner /etc/caddy/** kwrml,
-
-    /var/log/caddy/ r,
-    owner /var/log/caddy/ kwr,
-    owner /var/log/caddy/** kwrml,
-    
-    owner /data/config/caddy/ kwr,
-    owner /data/config/caddy/** kwrml,
-  }
-}
\ No newline at end of file
diff --git a/3dprinter-octoprint/build.yaml b/3dprinter-octoprint/build.yaml
index 0e4c766..7ebc4c1 100644
--- a/3dprinter-octoprint/build.yaml
+++ b/3dprinter-octoprint/build.yaml
@@ -8,4 +8,4 @@ labels:
   org.opencontainers.image.description: "3DPrinter-OctoPrint addon for Home-Assistant."
   org.opencontainers.image.source: "https://github.com/fredrikbaberg/ha-3dprinter-addons"
 args:
-  OCTOPRINT_VERSION: "1.9.3"
+  OCTOPRINT_VERSION: "1.10.3"
diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml
index b0d5b3c..f642ad8 100644
--- a/3dprinter-octoprint/config.yaml
+++ b/3dprinter-octoprint/config.yaml
@@ -1,5 +1,5 @@
 name: "3DPrinter-OctoPrint"
-version: "2024.01.2"
+version: "2024.11.0"
 slug: "3dprinter-octoprint"
 description: "OctoPrint as an addon, no additional bells and whistles."
 arch: