Fixes #14993: Migrate rudder_common_classes bundle to classes_generic

techniques/applications/apacheReverseProxy/2.0/configuration.st

@@ -59,7 +59,7 @@ bundle agent rudder_reverse_proxy_apache_configuration(service_name, internal_na
         create        => "true",
         edit_defaults => empty_backup,
         edit_line     => insert_proxy_entries("${rudder_reverse_proxy_apache_proxies}"),
-        classes       => rudder_common_classes("rudder_reverse_proxy_apache_configuration"),
+        classes       => classes_generic("rudder_reverse_proxy_apache_configuration"),
         comment       => "Edit the Apache reverse proxy file";
 
   # Class visibility forces us to use these bundles here.
@@ -108,13 +108,13 @@ bundle agent rudder_reverse_proxy_apache_configuration(service_name, internal_na
 
     debian::
       "/usr/sbin/a2enmod ${rudder_reverse_proxy_apache_debian_modules}"
-        classes    => rudder_common_classes("rudder_reverse_proxy_apache_modules"),
+        classes    => classes_generic("rudder_reverse_proxy_apache_modules"),
         ifvarclass => "!rudder_reverse_proxy_apache_mod_${rudder_reverse_proxy_apache_debian_modules}_loaded",
         comment    => "Enable Apache modules on Debian";
 
     rudder_reverse_proxy_apache_selinux_adjust.!rudder_reverse_proxy_apache_selinux_proxy_policy::
       "/usr/sbin/setsebool httpd_can_network_relay on"
-        classes => rudder_common_classes("rudder_reverse_proxy_apache_selinux"),
+        classes => classes_generic("rudder_reverse_proxy_apache_selinux"),
         comment => "Enable SELinux Apache entry to let Apache proxy entries";
 
 }

techniques/applications/apacheReverseProxy/2.0/installation.st

@@ -39,15 +39,15 @@ bundle agent rudder_reverse_proxy_apache_installation(service_name, internal_nam
       "${apache_package_name}"
         package_policy  => "add",
         package_method  => rudder_rug,
-        classes         => rudder_common_classes("rudder_reverse_proxy_apache_package"),
+        classes         => classes_generic("rudder_reverse_proxy_apache_package"),
         comment         => "Installing apache using the rug interface";
 
     !SuSE_10.rudder_reverse_proxy_apache_install_package::
 
       "${apache_package_name}"
         package_policy  => "add",
         package_method  => generic,
-        classes         => rudder_common_classes("rudder_reverse_proxy_apache_package"),
+        classes         => classes_generic("rudder_reverse_proxy_apache_package"),
         comment         => "Installing apache using generic interface";
 
 }

techniques/applications/zypperPackageManagerRepositories/1.0/zypper-repositories-management.st

@@ -60,15 +60,15 @@ bundle agent zypper_repositories_management
         perms         => m("644"),
         edit_line     => configure_zypper_repos("${zypper_name[${zypper_index}]}", "${zypper_url[${zypper_index}]}", "${zypper_enabled[${zypper_index}]}", "${zypper_type[${zypper_index}]}", "${zypper_autorefresh[${zypper_index}]}", "${this.promise_dirname}/zypper-repo.tml"),
         edit_defaults => empty_backup,
-        classes       => rudder_common_classes("zypper_repo_${zypper_index}");
+        classes       => classes_generic("zypper_repo_${zypper_index}");
 
     SuSE.zypper_disable_other_repositories::
 
       "/etc/zypp/repos.d/"
         delete       => tidy,
         file_select  => ex_list("@{zypper_files}"),
         depth_search => recurse("inf"),
-        classes      => rudder_common_classes("zypper_other_repos_disabled"),
+        classes      => classes_generic("zypper_other_repos_disabled"),
         comment      => "Delete the unwanted repos as requested";
 
   methods:

techniques/applications/zypperPackageManagerSetup/1.0/zypper-package-manager-setup.st

@@ -43,7 +43,7 @@ bundle agent zypper_package_manager_setup
         perms         => mog("644", "root", "0"),
         edit_defaults => noempty_backup,
         edit_line     => set_variable_values_ini("zypper_package_manager_setup.zmdconf", "${zypper_sections}"),
-        classes       => rudder_common_classes("${class_prefix}");
+        classes       => classes_generic("${class_prefix}");
 
 
   methods:

techniques/fileConfiguration/fileManagement/4.1/manageFilesAndFolders.st

@@ -126,21 +126,21 @@ bundle agent manageFilesAndFolders_RudderUniqueID {
     # Directory
     "${file[${index}][path]}/."
       create     => "true",
-      classes    => rudder_common_classes("manageFolders_${index}_RudderUniqueID"),
+      classes    => classes_generic("manageFolders_${index}_RudderUniqueID"),
       comment    => "Enforcing the existance of folder ${file[${index}][path]}",
       ifvarclass => "(!manageFilesAndFolders_nocreate_${index}.!manageFilesAndFolders_createfile_${index}.manageFilesAndFolders_createdir_${index}).!manageFilesAndFolders_local_cp_${index}.!manageFilesAndFolders_createsymlink_${index}";
 
     # File
     "${file[${index}][path]}"
       create     => "true",
-      classes    => rudder_common_classes("manageFiles_${index}_RudderUniqueID"),
+      classes    => classes_generic("manageFiles_${index}_RudderUniqueID"),
       comment    => "Enforcing the existance of file ${file[${index}][path]}",
       ifvarclass => "(!manageFilesAndFolders_nocreate_${index}.!manageFilesAndFolders_createdir_${index}.manageFilesAndFolders_createfile_${index}).!manageFilesAndFolders_local_cp_${index}.!manageFilesAndFolders_createsymlink_${index}";
 
     # Local copy
     "${file[${index}][path]}"
       copy_from  => backup_local_cp("${file[${index}][source]}"),
-      classes    => rudder_common_classes("manageCp_${index}_RudderUniqueID"),
+      classes    => classes_generic("manageCp_${index}_RudderUniqueID"),
       ifvarclass => "(!manageFilesAndFolders_nocreate_${index}.!manageFilesAndFolders_createdir_${index}.!manageFilesAndFolders_createfile_${index}).manageFilesAndFolders_local_cp_${index}.!manageFilesAndFolders_createsymlink_${index}",
       comment    => "Create ${file[${index}][path]} file as copy of ${file[${index}][source]}";
 
@@ -149,61 +149,61 @@ bundle agent manageFilesAndFolders_RudderUniqueID {
       # create   => "true",
       link_from  => ln_s("${file[${index}][source]}"),
       move_obstructions => "${file[${index}][symlink_enforced]}",
-      classes    => rudder_common_classes("manageSyms_${index}_RudderUniqueID"),
+      classes    => classes_generic("manageSyms_${index}_RudderUniqueID"),
       ifvarclass => "(!manageFilesAndFolders_nocreate_${index}.!manageFilesAndFolders_createdir_${index}.!manageFilesAndFolders_createfile_${index}).!manageFilesAndFolders_local_cp_${index}.manageFilesAndFolders_createsymlink_${index}",
       comment    => "Create the ${file[${index}][path]} symlink pointing to ${file[${index}][source]}";
 
     # Check the permissions none recursively
     ## With user and group
     "${file[${index}][path]}"
       perms      => mog("${extended_modes_${index}}${file[${index}][mode]}", "${file[${index}][owner]}", "${file[${index}][group]}"),
-      classes    => rudder_common_classes("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
+      classes    => classes_generic("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
       ifvarclass => "manageFilesAndFolders_check_permissions_${index}.!manageFilesAndFolders_isrecursive_${index}.manageFilesAndFolders_userset_${index}.manageFilesAndFolders_groupset_${index}";
     ## With user
     "${file[${index}][path]}"
       perms      => mo("${extended_modes_${index}}${file[${index}][mode]}", "${file[${index}][owner]}"),
-      classes    => rudder_common_classes("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
+      classes    => classes_generic("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
       ifvarclass => "manageFilesAndFolders_check_permissions_${index}.!manageFilesAndFolders_isrecursive_${index}.manageFilesAndFolders_userset_${index}.!manageFilesAndFolders_groupset_${index}";
     ## With group
     "${file[${index}][path]}"
       perms      => mg("${extended_modes_${index}}${file[${index}][mode]}", "${file[${index}][group]}"),
-      classes    => rudder_common_classes("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
+      classes    => classes_generic("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
       ifvarclass => "manageFilesAndFolders_check_permissions_${index}.!manageFilesAndFolders_isrecursive_${index}.manageFilesAndFolders_groupset_${index}.!manageFilesAndFolders_userset_${index}";
     # Check the permissions recursively on a folder
     ## With user and group
     "${file[${index}][path]}"
       depth_search => recurse_withroot("${file[${index}][recursive]}"),
       perms        => mog("${extended_modes_${index}}${file[${index}][mode]}", "${file[${index}][owner]}", "${file[${index}][group]}"),
-      classes      => rudder_common_classes("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
+      classes      => classes_generic("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
       ifvarclass   => "manageFilesAndFolders_check_permissions_${index}.manageFilesAndFolders_isrecursive_${index}.manageFilesAndFolders_userset_${index}.manageFilesAndFolders_groupset_${index}.!manageFilesAndFolders_isfile_${index}.manageFilesAndFolders_isdir_${index}";
     ## With user
     "${file[${index}][path]}"
       depth_search => recurse_withroot("${file[${index}][recursive]}"),
       perms        => mo("${extended_modes_${index}}${file[${index}][mode]}", "${file[${index}][owner]}"),
-      classes      => rudder_common_classes("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
+      classes      => classes_generic("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
       ifvarclass   => "manageFilesAndFolders_check_permissions_${index}.manageFilesAndFolders_isrecursive_${index}.manageFilesAndFolders_userset_${index}.!manageFilesAndFolders_groupset_${index}.!manageFilesAndFolders_isfile_${index}.manageFilesAndFolders_isdir_${index}";
     ## With group
     "${file[${index}][path]}"
       depth_search => recurse_withroot("${file[${index}][recursive]}"),
       perms        => mg("${extended_modes_${index}}${file[${index}][mode]}", "${file[${index}][group]}"),
-      classes      => rudder_common_classes("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
+      classes      => classes_generic("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
       ifvarclass   => "manageFilesAndFolders_check_permissions_${index}.manageFilesAndFolders_isrecursive_${index}.manageFilesAndFolders_groupset_${index}.!manageFilesAndFolders_userset_${index}.!manageFilesAndFolders_isfile_${index}.manageFilesAndFolders_isdir_${index}";
     # Check the permissions recursively on a file
     # Occurs when the recursive option is set, but in fact, we force a non recursive check due to an issue which prevents the check of a single file when using a recursive pattern.
     ## With user and group
     "${file[${index}][path]}"
       perms        => mog("${extended_modes_${index}}${file[${index}][mode]}", "${file[${index}][owner]}", "${file[${index}][group]}"),
-      classes      => rudder_common_classes("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
+      classes      => classes_generic("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
       ifvarclass   => "manageFilesAndFolders_check_permissions_${index}.manageFilesAndFolders_isrecursive_${index}.manageFilesAndFolders_userset_${index}.manageFilesAndFolders_groupset_${index}.manageFilesAndFolders_isfile_${index}.!manageFilesAndFolders_isdir_${index}";
     ## With user
     "${file[${index}][path]}"
       perms        => mo("${extended_modes_${index}}${file[${index}][mode]}", "${file[${index}][owner]}"),
-      classes      => rudder_common_classes("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
+      classes      => classes_generic("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
       ifvarclass   => "manageFilesAndFolders_check_permissions_${index}.manageFilesAndFolders_isrecursive_${index}.manageFilesAndFolders_userset_${index}.!manageFilesAndFolders_groupset_${index}.!manageFilesAndFolders_isfile_${index}.manageFilesAndFolders_isdir_${index}";
     ## With group
     "${file[${index}][path]}"
       perms        => mg("${extended_modes_${index}}${file[${index}][mode]}", "${file[${index}][group]}"),
-      classes      => rudder_common_classes("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
+      classes      => classes_generic("manageFilesAndFolders_perms_${index}_RudderUniqueID"),
       ifvarclass   => "manageFilesAndFolders_check_permissions_${index}.manageFilesAndFolders_isrecursive_${index}.manageFilesAndFolders_groupset_${index}.!manageFilesAndFolders_userset_${index}.!manageFilesAndFolders_isfile_${index}.manageFilesAndFolders_isdir_${index}";
 
     # This will not delete the parent
@@ -212,22 +212,22 @@ bundle agent manageFilesAndFolders_RudderUniqueID {
       file_select  => date_pattern("${file[${index}][ttl]}", "${file[${index}][pattern]}"),
       ifvarclass   => "manageFilesAndFolders_clean_${index}.manageFilesAndFolders_deletion_single_recursive_${index}",
       depth_search => recurse("0"),
-      classes      => rudder_common_classes("manageFilesAndFolders_delete_${index}_RudderUniqueID");
+      classes      => classes_generic("manageFilesAndFolders_delete_${index}_RudderUniqueID");
 
     # This will not delete the parent
     "${file[${index}][path]}" 
       delete       => tidy,
       file_select  => date_pattern("${file[${index}][ttl]}", "${file[${index}][pattern]}"),
       depth_search => recurse("inf"),
       ifvarclass   => "manageFilesAndFolders_clean_${index}.(manageFilesAndFolders_deletion_full_recursive_${index}|manageFilesAndFolders_deletion_exterminate_${index})",
-      classes      => rudder_common_classes("manageFilesAndFolders_delete_${index}_RudderUniqueID");
+      classes      => classes_generic("manageFilesAndFolders_delete_${index}_RudderUniqueID");
 
     # This WILL delete the parent
     "${file[${index}][path]}" 
       delete       => tidy,
       file_select  => date_pattern("${file[${index}][ttl]}", "${file[${index}][pattern]}"),
       ifvarclass   => "manageFilesAndFolders_clean_${index}.(manageFilesAndFolders_deletion_simple_${index}|manageFilesAndFolders_deletion_exterminate_${index})",
-      classes      => rudder_common_classes("manageFilesAndFolders_delete_${index}_RudderUniqueID");
+      classes      => classes_generic("manageFilesAndFolders_delete_${index}_RudderUniqueID");
 
   methods:
 

techniques/fileDistribution/checkGenericFileContent/8.0/checkGenericFileContent.st

@@ -508,13 +508,13 @@ bundle edit_line check_generic_file_content_edition_in_zone_RudderUniqueID(
     # to move, we delete from everywhere, and add it back in the proper location
     section_edition.migrate_to_zone.edit_section_valid::
       "${section_delimiters}"
-        classes => rudder_common_classes("delete_out_of_zone_section_${index}_RudderUniqueID"),
+        classes => classes_generic("delete_out_of_zone_section_${index}_RudderUniqueID"),
         comment => "Removing matched lines out of zone ...";
 
     # remove line out of zone if we decide to do so
     edit_content.migrate_to_zone.pass_two::
       "${escaped_content[${content_line_index}]}"
-        classes => rudder_common_classes("delete_out_of_zone_content_${index}_RudderUniqueID"),
+        classes => classes_generic("delete_out_of_zone_content_${index}_RudderUniqueID"),
         comment => "Removing matched lines out of zone ...";
 
   insert_lines:

techniques/fileDistribution/copyGitFile/2.3/copyFileFromSharedFolder.st

@@ -142,7 +142,7 @@ bundle agent download_from_shared_folder_RudderUniqueID
                             "${copyfile[${index}][group]}"
                            ),
         comment      => "Enforce content of ${copyfile[${index}][destination]} based on the content on the Rudder server with ${copyfile[${index}][compare_method]} method",
-        classes      => rudder_common_classes("copy_file_${index}_RudderUniqueID"),
+        classes      => classes_generic("copy_file_${index}_RudderUniqueID"),
         ifvarclass   => "(!exist_${index}|!is_file_${index}).!apply_regex_${index}";
 
        # If it's a directory, with exclusion
@@ -156,7 +156,7 @@ bundle agent download_from_shared_folder_RudderUniqueID
                             "${copyfile[${index}][group]}"
                            ),
         comment      => "Enforce content of ${copyfile[${index}][destination]} based on the content on the Rudder server with ${copyfile[${index}][compare_method]} method",
-        classes      => rudder_common_classes("copy_file_${index}_RudderUniqueID"),
+        classes      => classes_generic("copy_file_${index}_RudderUniqueID"),
         ifvarclass   => "(!exist_${index}|!is_file_${index}).need_exclusion_${index}";
 
        # If it's a directory, with inclusion
@@ -170,7 +170,7 @@ bundle agent download_from_shared_folder_RudderUniqueID
                             "${copyfile[${index}][group]}"
                            ),
         comment      => "Enforce content of ${copyfile[${index}][destination]} based on the content on the Rudder server with ${copyfile[${index}][compare_method]} method with inclusion of '${copyfile[${index}][exclude_include]}'",
-        classes      => rudder_common_classes("copy_file_${index}_RudderUniqueID"),
+        classes      => classes_generic("copy_file_${index}_RudderUniqueID"),
         ifvarclass   => "(!exist_${index}|!is_file_${index}).need_inclusion_${index}";
 
     # If it s a file, the depth_search prevents from enforcing the file content
@@ -186,7 +186,7 @@ bundle agent download_from_shared_folder_RudderUniqueID
                           "${copyfile[${index}][group]}"
                          ),
         comment    => "Enforce content of file ${copyfile[${index}][destination]} based on the content on the Rudder server with ${copyfile[${index}][compare_method]} method with exclusion of '${copyfile[${index}][exclude_include]}'",
-        classes    => rudder_common_classes("copy_file_${index}_RudderUniqueID"),
+        classes    => classes_generic("copy_file_${index}_RudderUniqueID"),
         ifvarclass => "exist_${index}.is_file_${index}";
 
   methods:

techniques/system/common/1.0/cron-setup.cf

@@ -72,7 +72,7 @@ bundle agent setup_cronjob
         create        => "true",
         perms         => mog("600", "root", "cron"),
         edit_line     => insert_lines("0,5,10,15,20,25,30,35,40,45,50,55 * * * * /opt/rudder/bin/rudder agent check -q >> /var/log/rudder/agent-check/check.log 2>&1"),
-        classes       => rudder_common_classes("rudder_aix_crontab_insertion"),
+        classes       => classes_generic("rudder_aix_crontab_insertion"),
         comment       => "Insert an AIX-compatible user crontab to run /opt/rudder/bin/rudder agent check";
 
 }