Fixes #12593: Add support for BSD-style init scripts services (rc.d) (slackware) #764

victorqrt · 2018-05-29T12:34:47Z

https://www.rudder-project.org/redmine/issues/12593

victorqrt · 2018-05-29T13:18:26Z

Commit modified

peckpeck · 2018-05-29T14:41:05Z

tree/30_generic_methods/_classes_copy.cf

-      "destination_exists"         and => { "destination_defined", "destination_not_empty" };
-
+  methods:
+  "copy" usebundle => ncf_classes_copy("${source_prefix}", "${destination_prefix}");


missing indent

peckpeck · 2018-05-29T14:47:32Z

tree/20_cfe_basics/ncf_lib.cf

@@ -987,6 +1017,10 @@ bundle agent ncf_services(service, action)
      "action_command"             string => "${svc_action_cmd[${action}]}";
      "method"                     string => "svcadm/svcs";

+    # Slackware
+    pass1.slackware.!systemctl_utility_present.!is_upstart_service.!svcadm_utility_present::


if it is a slackware the other conditions are useless

peckpeck · 2018-05-29T14:56:07Z

tree/20_cfe_basics/ncf_lib.cf

      "action_command" string => "${paths.path[test]} -f /etc/rc`/sbin/runlevel | ${paths.path[cut]} -d' ' -f2`.d/S??${service}";
      "method"         string => "/etc/rcX.d/";

+    # Slackware boot actions are not performed by command, they are implemented in the 'methods' promises


this message doesn't seem to be at its place

It is left here because in the previous "non-boot actions" block, we are defining action_commands and/or methods for all the platforms, so one may expect to find Slackware boot actions at this place. As we do not perform those actions in "vars" promises, this is explaining where to find them

peckpeck · 2018-05-29T15:43:42Z

tree/20_cfe_basics/ncf_lib.cf

+                    ifvarclass => "!is_check_action";
+    # is-active is mapped to "status"
+     "action_command" string => "/etc/rc.d/rc.${service} status",
+                    ifvarclass => "is_check_action";


this should have been merged with the previous block

moreover the "method" string line should be here for a better readability

peckpeck · 2018-05-29T15:45:18Z

tree/20_cfe_basics/ncf_lib.cf

@@ -1114,7 +1158,7 @@ bundle agent ncf_services(service, action)
    #####
    # Actual command - for checks on non-windows systems
    #####
-    pass1.is_check_action.!windows.!is_process_action.method_found::
+    pass1.is_check_action.!windows.!is_process_action.method_found.!(slackware.is_boot_action)::


can is_check_action be defined at the same time as is_boot_action ?

Yes, iff action == "is-enabled"

peckpeck · 2018-05-29T15:49:27Z

tree/20_cfe_basics/ncf_lib.cf

+      "chmod 644" usebundle => perm_on_file("/etc/rc.d/rc.${service}", "644", "${old_class_prefix}", "${class_prefix}");
+
+    action_enable::
+      "chmod 755" usebundle => perm_on_file("/etc/rc.d/rc.${service}", "755", "${old_class_prefix}", "${class_prefix}");


peckpeck · 2018-05-29T15:51:37Z

tree/20_cfe_basics/ncf_lib.cf

+    action_is_enabled::
+      "enable dry run" usebundle => push_dry_run_mode("true");
+      "chmod 755" usebundle => perm_on_file("/etc/rc.d/rc.${service}", "755", "${canon_service}_init_script_execmod", "${canon_service}_init_script_execmod");
+      "block in init scripts" usebundle => service_block_rc_d("${service}", "${old_class_prefix}", "${class_prefix}");


I think you need an ifvarclass ${canon_service}_init_script_execmod_ok here

I can add it to force the bundle to stop checking on failing the first condition (755 mod on the init script).
It does work without it however, because in case it fails and then meets the "block in script" requirement, the _not_ok classes will still get reported.

peckpeck · 2018-05-29T15:54:16Z

tree/20_cfe_basics/ncf_lib.cf

+  files:
+    "/etc/rc.d/rc.local"
+    edit_line => edit_service_block_rc_d("${service}"),
+    classes => classes_generic("service_${canon_service}_block_in_rc_local");


So we prefer editing rc.local over editing rc.M ?

peckpeck · 2018-05-29T16:44:53Z

tree/20_cfe_basics/ncf_lib.cf

+    edit_line => edit_service_block_rc_d("${service}"),
+    classes => classes_generic("service_${canon_service}_block_in_rc_local");
+
+    "/etc/rc.d/rc.M"


Can you add a line of comment to tell what happens when wry_run mode is enabled ?

peckpeck · 2018-05-29T16:47:07Z

tree/30_generic_methods/service_check_started_at_boot.cf

-                          ifvarclass => "ncf_services_${canonified_service_name}_is_enabled_reached";
-      "new result classes" usebundle => _classes_copy("${class_prefix}_check_enabled", "${class_prefix}"),
-                          ifvarclass => "${class_prefix}_check_enabled_reached";
+      "success" usebundle => _classes_success("${old_class_prefix}"),


Why this change ? is there a repaired that appears during an is-enabled ?

This was for testing purposes, I forgot to add it back.

Normation-Quality-Assistant · 2018-05-29T16:47:22Z

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/ncf/pull/764
-- Your faithful QA

Normation-Quality-Assistant · 2018-05-29T16:47:24Z

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/ncf/pull/764
-- Your faithful QA

peckpeck

It was a mistake to approve it

victorqrt · 2018-06-05T08:49:56Z

Commit modified

peckpeck · 2018-06-06T09:27:56Z

tree/20_cfe_basics/ncf_lib.cf

+
+  # When the dry run mode is enabled, the needed changes will not be applied, but the classes will be copied
+  files:
+    "/etc/rc.d/rc.local"


you need to manage rc.localshutdown too

…(slackware)

victorqrt · 2018-06-07T14:40:00Z

Commit modified

Normation-Quality-Assistant · 2018-06-15T09:30:34Z

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/ncf/pull/764
-- Your faithful QA

peckpeck · 2018-06-15T10:22:54Z

OK, merging this PR

victorqrt force-pushed the ust_12593/add_support_for_bsd_style_init_scripts_services_rc_d_slackware branch 5 times, most recently from f63011b to f21b2c7 Compare May 29, 2018 13:17

victorqrt force-pushed the ust_12593/add_support_for_bsd_style_init_scripts_services_rc_d_slackware branch from f21b2c7 to 129a927 Compare May 29, 2018 13:18

peckpeck approved these changes May 29, 2018

View reviewed changes

Normation-Quality-Assistant added the qa: Can't merge label May 29, 2018

peckpeck requested changes May 30, 2018

View reviewed changes

VinceMacBuche removed the qa: Can't merge label Jun 5, 2018

victorqrt force-pushed the ust_12593/add_support_for_bsd_style_init_scripts_services_rc_d_slackware branch from 129a927 to 8ce24f1 Compare June 5, 2018 08:49

peckpeck reviewed Jun 6, 2018

View reviewed changes

Fixes #12593: Add support for BSD-style init scripts services (rc.d) …

9f87087

…(slackware)

victorqrt force-pushed the ust_12593/add_support_for_bsd_style_init_scripts_services_rc_d_slackware branch from 8ce24f1 to 9f87087 Compare June 7, 2018 14:40

peckpeck approved these changes Jun 15, 2018

View reviewed changes

Normation-Quality-Assistant added the qa: Can't merge label Jun 15, 2018

peckpeck merged commit 9f87087 into Normation:branches/rudder/4.1 Jun 15, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #12593: Add support for BSD-style init scripts services (rc.d) (slackware) #764

Fixes #12593: Add support for BSD-style init scripts services (rc.d) (slackware) #764

victorqrt commented May 29, 2018

victorqrt commented May 29, 2018

peckpeck May 29, 2018

peckpeck May 29, 2018

peckpeck May 29, 2018

victorqrt May 30, 2018 •

edited

Loading

peckpeck May 29, 2018

peckpeck May 29, 2018

peckpeck May 29, 2018

victorqrt May 30, 2018

peckpeck May 29, 2018

peckpeck May 29, 2018

victorqrt May 30, 2018

peckpeck May 29, 2018

victorqrt May 30, 2018

peckpeck May 29, 2018

peckpeck May 29, 2018

victorqrt Jun 5, 2018

Normation-Quality-Assistant commented May 29, 2018

Normation-Quality-Assistant commented May 29, 2018

peckpeck left a comment

victorqrt commented Jun 5, 2018

peckpeck Jun 6, 2018

victorqrt commented Jun 7, 2018

Normation-Quality-Assistant commented Jun 15, 2018

peckpeck commented Jun 15, 2018

Fixes #12593: Add support for BSD-style init scripts services (rc.d) (slackware) #764

Fixes #12593: Add support for BSD-style init scripts services (rc.d) (slackware) #764

Conversation

victorqrt commented May 29, 2018

victorqrt commented May 29, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

victorqrt May 30, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Normation-Quality-Assistant commented May 29, 2018

Normation-Quality-Assistant commented May 29, 2018

peckpeck left a comment

Choose a reason for hiding this comment

victorqrt commented Jun 5, 2018

Choose a reason for hiding this comment

victorqrt commented Jun 7, 2018

Normation-Quality-Assistant commented Jun 15, 2018

peckpeck commented Jun 15, 2018

victorqrt May 30, 2018 •

edited

Loading