From 2bdbb56a24a7c71592817b905d3dade7dd8ccaa7 Mon Sep 17 00:00:00 2001
From: Brenner-Bot <dev@brenner.tech>
Date: Wed, 3 Aug 2022 18:43:34 +0000
Subject: [PATCH] :tada: Release of add-on Cloudflared 2.0.6

---
 README.md                |  6 ++---
 cloudflared/CHANGELOG.md | 13 +++++++---
 cloudflared/apparmor.txt | 56 ----------------------------------------
 cloudflared/config.yaml  |  2 +-
 4 files changed, 13 insertions(+), 64 deletions(-)
 delete mode 100644 cloudflared/apparmor.txt

diff --git a/README.md b/README.md
index e182d71..33d9697 100644
--- a/README.md
+++ b/README.md
@@ -86,10 +86,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-[addon-cloudflared]: https://github.com/brenner-tobias/addon-cloudflared/tree/v2.0.5
-[addon-doc-cloudflared]: https://github.com/brenner-tobias/addon-cloudflared/blob/v2.0.5/README.md
+[addon-cloudflared]: https://github.com/brenner-tobias/addon-cloudflared/tree/v2.0.6
+[addon-doc-cloudflared]: https://github.com/brenner-tobias/addon-cloudflared/blob/v2.0.6/README.md
 [cloudflared-issue]: https://github.com/brenner-tobias/addon-cloudflared/issues
-[cloudflared-version-shield]: https://img.shields.io/badge/version-v2.0.5-blue.svg
+[cloudflared-version-shield]: https://img.shields.io/badge/version-v2.0.6-blue.svg
 [cloudflared-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [cloudflared-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [cloudflared-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/cloudflared/CHANGELOG.md b/cloudflared/CHANGELOG.md
index af31724..b4f5cf1 100644
--- a/cloudflared/CHANGELOG.md
+++ b/cloudflared/CHANGELOG.md
@@ -1,9 +1,14 @@
 ## What’s changed
-## 📚 Documentation
+## 🐛 Bug fixes
 
-- Add section with workaround for revoking cert.pem @galbatoriz (#128)
+- Remove custom apparmor.txt | fixes issue on Ubuntu Supervised installations @elcajon (#138)
+
+## 🚀 Enhancements
+
+- Log error message if tunnel name doesn't fit  @elcajon (#132)
 
 ## ⬆️ Dependency updates
 
-- Bump frenck/action-yamllint from 1.1 to 1.2 @dependabot (#124)
-- Bump docker/build-push-action from 3.0.0 to 3.1.0 @dependabot (#126)
+- ⬆️ Update yq to 4.25.1-r2 @elcajon (#133)
+- ⬆️ Update base image to v12.2.2 @elcajon (#134)
+- ⬆️ Update yq to 4.25.1-r3 @elcajon (#137)
diff --git a/cloudflared/apparmor.txt b/cloudflared/apparmor.txt
deleted file mode 100644
index 75926db..0000000
--- a/cloudflared/apparmor.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <tunables/global>
-
-profile cloudflared flags=(attach_disconnected,mediate_deleted) {
-  #include <abstractions/base>
-
-  # Capabilities
-  file,
-  signal (send) set=(kill,term,int,hup,cont),
-
-  # S6-Overlay from HA OS default apparmor profile
-  /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,
-  
-  # S6-Overlay from cloudflared add-on
-  /etc/s6-overlay/** rwix,
-
-  # Bashio
-  /usr/lib/bashio/** ix,
-  /tmp/** rwk,
-  
-  # Access to options.json and other files within your addon
-  /data/** rw,
-
-  # Start new profile for cloudflared service
-  #/usr/bin/cloudflared cx -> cloudflared,
-
-  profile cloudflared flags=(attach_disconnected,mediate_deleted) {
-    #include <abstractions/base>
-
-    # Access to options.json and other files within your addon
-    /data/** rw,
-
-    # Access to mapped volumes specified in config.json
-    /share/** rw,
-    /config/** rw,
-    /ssl/** rw,
-    
-    # Access to add-on generated config.yaml
-    /tmp/** rw,
-    
-    # Access required for service functionality
-    /usr/bin/cloudflared r,
-
-    # Receive signals from S6-Overlay
-    signal receive,
-  }
-}
diff --git a/cloudflared/config.yaml b/cloudflared/config.yaml
index e1965f9..871f39a 100644
--- a/cloudflared/config.yaml
+++ b/cloudflared/config.yaml
@@ -42,4 +42,4 @@ schema:
   - str?
 slug: cloudflared
 url: https://github.com/brenner-tobias/addon-cloudflared/
-version: 2.0.5
+version: 2.0.6