update-ids-ruleset: Release ids_page_lock when the downloader fails.

[ipfire-2.x.git] / src / scripts / update-ids-ruleset

diff --git a/src/scripts/update-ids-ruleset b/src/scripts/update-ids-ruleset
index fe4f838445cd70cabe3406208e803fbf8fb7dc70..956c3a1f5d406f436fb6955643b66c608aae30c0 100644 (file)
--- a/src/scripts/update-ids-ruleset
+++ b/src/scripts/update-ids-ruleset
@@ -31,7 +31,7 @@ unless (-e "${General::swroot}/red/active") {
        &IDS::_log_to_syslog("The system is offline.");
 
        # Store error message for displaying in the WUI.
-       &IDS::_store_error_message("$Lang::tr{'could not download latest updates'}");
+       &IDS::_store_error_message("$Lang::tr{'could not download latest updates'} - $Lang::tr{'system is offline'}");
 
        # Exit.
        exit 0;
@@ -46,18 +46,33 @@ if(&IDS::checkdiskspace()) {
        exit 0;
 }
 
+# Lock the IDS page.
+&IDS::lock_ids_page();
+
 # Call the download function and gather the new ruleset.
 if(&IDS::downloadruleset()) {
        # Store error message for displaying in the WUI.
        &IDS::_store_error_message("$Lang::tr{'could not download latest updates'}");
 
+       # Unlock the IDS page.
+       &IDS::unlock_ids_page();
+
        # Exit.
        exit 0;
 }
 
+# Set correct ownership for the downloaded tarball.
+&IDS::set_ownership("$IDS::rulestarball");
+
 # Call oinkmaster to alter the ruleset.
 &IDS::oinkmaster();
 
+# Set correct ownership for the rulesdir and files.
+&IDS::set_ownership("$IDS::rulespath");
+
+# Unlock the IDS page.
+&IDS::unlock_ids_page();
+
 # Check if the IDS is running.
 if(&IDS::ids_is_running()) {
        # Call suricatactrl to perform a reload.