fix: add cron library

Author: gsanchietti

packages/ns-api/files/ns.ha

@@ -137,23 +137,13 @@ def setup(role, lan_interface, ha_interface, virtual_ip, ha_main_ipaddress, ha_s
         u.set('keepalived', 'backup', 'track_interface', [f'{lan_interface}_ha'])
         u.set('keepalived', 'backup', 'track_script', ['receiver'])
 
-        # Fix OpenVPN permissions
-        group_file = '/etc/group'
-        rsync_dir = '/usr/share/keepalived/rsync/etc/'
-
-        # Update the group file, if needed
-        with open(group_file, 'r') as file:
-            group_data = file.read()
-
-        if 'root:x:0:keepalived' not in group_data:
-            group_data = group_data.replace('root:x:0:', 'root:x:0:keepalived')
-
-            with open(group_file, 'w') as file:
-                file.write(group_data)
+        # Append publick key to root dropbear authorized_keys
+        with open('/etc/dropbear/authorized_keys', 'a') as file:
+            file.write(pubkey + '\n')
 
         # Create the rsync directory if it doesn't exist
+        rsync_dir = '/usr/share/keepalived/rsync/etc/'
         os.makedirs(rsync_dir, exist_ok=True)
-
         # Change permissions of the rsync directory
         os.chmod(rsync_dir, 0o2775)
 

packages/ns-ha/Makefile

@@ -37,9 +37,11 @@ endef
 define Package/ns-ha/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/keepalived
+	$(INSTALL_DIR) $(1)/lib/functions/keepalived
 	$(INSTALL_BIN) ./files/keepalived-config $(1)/usr/sbin
 	$(INSTALL_DATA) ./files/600-openvpn $(1)/etc/hotplug.d/keepalived
 	$(INSTALL_DATA) ./files/900-ns-plug $(1)/etc/hotplug.d/keepalived
+	$(INSTALL_DATA) ./files/ns.sh $(1)/lib/functions/keepalived
 endef
 
 $(eval $(call BuildPackage,ns-ha))

packages/ns-ha/files/600-openvpn

@@ -11,4 +11,9 @@ set_stop_if_backup
 add_sync_file /etc/openvpn
 add_sync_file /etc/config/openvpn
 
+if [ "$ACTION" == "NOTIFY_SYNC" ]; then
+    home=$(get_rsync_user_home)
+    rsync -avr $home/etc/openvpn/ /etc/openvpn/
+fi
+
 keepalived_hotplug

packages/ns-ha/files/900-ns-plug

@@ -2,28 +2,17 @@
 
 # shellcheck source=/dev/null
 . /lib/functions/keepalived/hotplug.sh
-
-disable_cron() {
-    crontab -l | sed '/send-heartbeat/s/^/#/' | crontab -
-    crontab -l | sed '/send-backup/s/^/#/' | crontab -
-    crontab -l | sed '/send-inventory/s/^/#/' | crontab -
-}
-
-enable_command() {
-    crontab -l | sed '/send-heartbeat/s/^#//' | crontab -
-    crontab -l | sed '/send-backup/s/^#//' | crontab -
-    crontab -l | sed '/send-inventory/s/^#//' | crontab -
-}
+. /lib/functions/keepalived/ns.sh
 
 set_service_name ns-plug
 
 set_restart_if_master
 set_stop_if_backup
 
 if [ "$ACTION" == "NOTIFY_BACKUP" ]; then
-    disable_cron
+    update_cron "disable" "send-heartbeat send-backup send-inventory"
 elif [ "$ACTION" == "NOTIFY_MASTER" ]; then
-    enable_cron
+    update_cron "enable" "send-heartbeat send-backup send-inventory"
 fi
 
 add_sync_file /etc/config/ns-plug

packages/ns-ha/files/ns.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Function to update crontab entries based on action (disable or enable)
+update_cron() {
+    local action="$1"
+    local commands="$2"
+    local sed_command
+
+    # Determine the appropriate sed command based on the action
+    if [ "$action" = "disable" ]; then
+        sed_command='s/^\([^#]\)/#\1/'
+    elif [ "$action" = "enable" ]; then
+        sed_command='s/^#//'
+    else
+        echo "Invalid action: $action"
+        return 1
+    fi
+
+    # Create a temporary file to store modified crontab
+    temp_crontab=$(mktemp)
+    crontab -l > "$temp_crontab"
+
+    # Loop through each command and apply the sed transformation
+    for cmd in $commands; do
+        sed -i "/$cmd/$sed_command" "$temp_crontab"
+    done
+
+    # Update the crontab with the modified content
+    crontab "$temp_crontab"
+    rm "$temp_crontab"
+}