From 36b6e801e50698f64d35ceea5c9e31c844227655 Mon Sep 17 00:00:00 2001
From: Sophie Schiller <sophie.schiller01@gmail.com>
Date: Sat, 20 Feb 2021 17:32:09 +0100
Subject: [PATCH] update bashrc

---
 data/users/files/bash/sophie.bashrc | 1 +
 data/users/files/tmux/sophie.conf   | 2 +-
 nodes/htz-cloud/miniserver.py       | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 data/users/files/bash/sophie.bashrc

diff --git a/data/users/files/bash/sophie.bashrc b/data/users/files/bash/sophie.bashrc
new file mode 100644
index 0000000..3cd6aec
--- /dev/null
+++ b/data/users/files/bash/sophie.bashrc
@@ -0,0 +1 @@
+export PS1='\[\e[1;34m\][\[\e[1;32m\]'"$__node_name"'\[\e[1;34m\]][\[\e[1;32m\]\u\[\e[1;34m\]@\[\e[1;32m\]\w\[\e[1;34m\]] $PRODWARNING> \[\e[0m\]'
diff --git a/data/users/files/tmux/sophie.conf b/data/users/files/tmux/sophie.conf
index 39d4ba8..d8c2819 100644
--- a/data/users/files/tmux/sophie.conf
+++ b/data/users/files/tmux/sophie.conf
@@ -32,7 +32,7 @@ set -g status-left-length 14
 set -g status-right-length 140
 #set -g status-left '#[default]〘 '
 set -g status-left '#[fg=green,bright]#(uname -r | cut -c 1-8)#[default]〘'
-set -g status-right "〙🔋 #(upower -i /org/freedesktop/UPower/devices/battery_BAT1 | grep time | awk '{print $4, $5}' | sed 's/hours/h/; s/minutes/m/; s/,/\./') #[fg=red,bg=default]⇑#(uptime -p |sed 's/\ week/w/; s/\ days/d/; s/\ day/d/; s/\ hours/h/; s/\ minutes/m/; s/\ minute/m/; s/,//g; s/up//') #[fg=green,bg=default]⎋ #(cat /proc/loadavg | awk '{print $1,$2,$3}')  #[fg=blue]⌚ %Y-%m-%d #[fg=white,bg=default]⌚ %H:%M #[fg=green]⚼ #H"
+set -g status-right "〙#[fg=red,bg=default]⇑#(uptime -p |sed 's/\ week/w/; s/\ days/d/; s/\ day/d/; s/\ hours/h/; s/\ minutes/m/; s/\ minute/m/; s/,//g; s/up//') #[fg=green,bg=default]⎋ #(cat /proc/loadavg | awk '{print $1,$2,$3}')  #[fg=blue] %Y-%m-%d #[fg=white,bg=default] %H:%M #[fg=green] #H"
 
 # C-b is not acceptable -- Vim uses it
 set-option -g prefix C-a
diff --git a/nodes/htz-cloud/miniserver.py b/nodes/htz-cloud/miniserver.py
index 44e9c62..601734c 100644
--- a/nodes/htz-cloud/miniserver.py
+++ b/nodes/htz-cloud/miniserver.py
@@ -32,7 +32,9 @@ nodes['htz-cloud.miniserver'] = {
         'backups': {
             'exclude_from_backups': True,
         },
-        'exclude_from_monitoring': True,
+        'icinga_options': {
+            'exclude_from_monitoring': True,
+        },
         'letsencrypt': {
             'concat_and_deploy': {
                 'sophie-weechat': {
@@ -52,6 +54,11 @@ nodes['htz-cloud.miniserver'] = {
         'nginx': {
             'vhosts': {
                 'i.sophies-kitchen.eu': {
+                    'webroot_config': {
+                        'owner': 'sophie',
+                        'group': 'sophie',
+                        'mode': '0755',
+                    },
                 },
             },
         },