Add 24.7 Support (#146)

* Rebase with d64d7a6 * restructured module_index --------- Co-authored-by: kdhlab <[email protected]> Co-authored-by: KiLLuuuhh <[email protected]>
puzzle · Aug 16, 2024 · d40cade · d40cade
1 parent d64d7a6
commit d40cade
Show file tree

Hide file tree

Showing 6 changed files with 176 additions and 2 deletions.
diff --git a/molecule/firewall_rules/molecule.yml b/molecule/firewall_rules/molecule.yml
@@ -46,7 +46,6 @@ platforms:
       - 'vm.guest = :freebsd'
       - 'ssh.sudo_command = "%c"'
       - 'ssh.shell = "/bin/sh"'
-
   - name: "24.1"
     box: puzzle/opnsense
     hostname: false
@@ -57,6 +56,16 @@ platforms:
       - 'vm.guest = :freebsd'
       - 'ssh.sudo_command = "%c"'
       - 'ssh.shell = "/bin/sh"'
+  - name: "24.7"
+    box: puzzle/opnsense
+    hostname: false
+    box_version: "24.7"
+    memory: 1024
+    cpus: 2
+    instance_raw_config_args:
+      - 'vm.guest = :freebsd'
+      - 'ssh.sudo_command = "%c"'
+      - 'ssh.shell = "/bin/sh"'
 
 provisioner:
   name: ansible

diff --git a/molecule/interfaces_assignments/molecule.yml b/molecule/interfaces_assignments/molecule.yml
@@ -56,6 +56,16 @@ platforms:
         - 'vm.guest = :freebsd'
         - 'ssh.sudo_command = "%c"'
         - 'ssh.shell = "/bin/sh"'
+    - name: "24.7"
+      box: puzzle/opnsense
+      hostname: false
+      box_version: "24.7"
+      memory: 1024
+      cpus: 2
+      instance_raw_config_args:
+        - 'vm.guest = :freebsd'
+        - 'ssh.sudo_command = "%c"'
+        - 'ssh.shell = "/bin/sh"'
 
 provisioner:
     name: ansible

diff --git a/molecule/system_access_users/molecule.yml b/molecule/system_access_users/molecule.yml
@@ -58,6 +58,16 @@ platforms:
         - 'vm.guest = :freebsd'
         - 'ssh.sudo_command = "%c"'
         - 'ssh.shell = "/bin/sh"'
+    - name: "24.7"
+      box: puzzle/opnsense
+      hostname: false
+      box_version: "24.7"
+      memory: 1024
+      cpus: 2
+      instance_raw_config_args:
+        - 'vm.guest = :freebsd'
+        - 'ssh.sudo_command = "%c"'
+        - 'ssh.shell = "/bin/sh"'
 
 provisioner:
     name: ansible

diff --git a/molecule/system_settings_general/molecule.yml b/molecule/system_settings_general/molecule.yml
@@ -56,6 +56,16 @@ platforms:
         - 'vm.guest = :freebsd'
         - 'ssh.sudo_command = "%c"'
         - 'ssh.shell = "/bin/sh"'
+    - name: "24.7"
+      box: puzzle/opnsense
+      hostname: false
+      box_version: "24.7"
+      memory: 1024
+      cpus: 2
+      instance_raw_config_args:
+        - 'vm.guest = :freebsd'
+        - 'ssh.sudo_command = "%c"'
+        - 'ssh.shell = "/bin/sh"'
 
 provisioner:
     name: ansible

diff --git a/molecule/system_settings_logging/molecule.yml b/molecule/system_settings_logging/molecule.yml
@@ -56,7 +56,16 @@ platforms:
           - 'vm.guest = :freebsd'
           - 'ssh.sudo_command = "%c"'
           - 'ssh.shell = "/bin/sh"'
-
+    - name: "24.7"
+      box: puzzle/opnsense
+      hostname: false
+      box_version: "24.7"
+      memory: 1024
+      cpus: 2
+      instance_raw_config_args:
+        - 'vm.guest = :freebsd'
+        - 'ssh.sudo_command = "%c"'
+        - 'ssh.shell = "/bin/sh"'
 provisioner:
     name: ansible
     env:

diff --git a/plugins/module_utils/module_index.py b/plugins/module_utils/module_index.py
@@ -615,6 +615,132 @@
         },
     },
     "24.7": {
+        "system_settings_general": {
+            "hostname": "system/hostname",
+            "domain": "system/domain",
+            "timezone": "system/timezone",
+            # Add other mappings here
+            "php_requirements": [
+                "/usr/local/etc/inc/config.inc",
+                "/usr/local/etc/inc/util.inc",
+                "/usr/local/etc/inc/filter.inc",
+                "/usr/local/etc/inc/system.inc",
+                "/usr/local/etc/inc/interfaces.inc",
+            ],
+            "configure_functions": {
+                "system_timezone_configure": {
+                    "name": "system_timezone_configure",
+                    "configure_params": ["true"],
+                },
+                "system_trust_configure": {
+                    "name": "system_trust_configure",
+                    "configure_params": ["true"],
+                },
+                "system_hostname_configure": {
+                    "name": "system_hostname_configure",
+                    "configure_params": ["true"],
+                },
+                "system_hosts_generate": {
+                    "name": "system_hosts_generate",
+                    "configure_params": ["true"],
+                },
+                "system_resolvconf_generate": {
+                    "name": "system_resolvconf_generate",
+                    "configure_params": ["true"],
+                },
+                "plugins_configure_dns": {
+                    "name": "plugins_configure",
+                    "configure_params": ["'dns'", "true"],
+                },
+                "plugins_configure_dhcp": {
+                    "name": "plugins_configure",
+                    "configure_params": ["'dhcp'", "true"],
+                },
+                "filter_configure": {
+                    "name": "filter_configure",
+                    "configure_params": ["true"],
+                },
+            },
+        },
+        "system_settings_logging": {
+            "preserve_logs": "syslog/preservelogs",
+            "max_log_file_size_mb": "syslog/maxfilesize",
+            # Add other mappings here
+            "php_requirements": [
+                "/usr/local/etc/inc/config.inc",
+                "/usr/local/etc/inc/util.inc",
+                "/usr/local/etc/inc/system.inc",
+            ],
+            "configure_functions": {
+                "system_settings_logging": {
+                    "name": "system_syslog_start",
+                    "configure_params": ["true"],
+                }
+            },
+        },
+        "system_access_users": {
+            "users": "system/user",
+            "uid": "system/nextuid",
+            "gid": "system/nextgid",
+            "system": "system",
+            "php_requirements": [
+                "/usr/local/etc/inc/system.inc",
+            ],
+            "configure_functions": {},
+        },
+        "password": {
+            "php_requirements": [
+                "/usr/local/etc/inc/auth.inc",
+            ],
+            "configure_functions": {
+                "password": {
+                    "name": "echo password_hash",
+                    "configure_params": [
+                        "'password'",
+                        "PASSWORD_BCRYPT",
+                        "[ 'cost' => 11 ]",
+                    ],
+                },
+            },
+        },
+        "firewall_rules": {
+            "rules": "filter",
+            "php_requirements": [
+                "/usr/local/etc/inc/interfaces.inc",
+                "/usr/local/etc/inc/config.inc",
+                "/usr/local/etc/inc/util.inc",
+                "/usr/local/etc/inc/system.inc",
+                "/usr/local/etc/inc/filter.inc",
+            ],
+            "configure_functions": {
+                "system_cron_configure": {
+                    "name": "system_cron_configure",
+                    "configure_params": ["true"],
+                },
+                "filter_configure": {
+                    "name": "filter_configure",
+                    "configure_params": [],
+                },
+            },
+        },
+        "interfaces_assignments": {
+            "interfaces": "interfaces",
+            # Add other mappings here.
+            "php_requirements": [
+                "/usr/local/etc/inc/config.inc",
+                "/usr/local/etc/inc/util.inc",
+                "/usr/local/etc/inc/filter.inc",
+                "/usr/local/etc/inc/system.inc",
+                "/usr/local/etc/inc/rrd.inc",
+                "/usr/local/etc/inc/interfaces.inc",
+            ],
+            "configure_functions": {
+                "filter_configure": {
+                    "name": "filter_configure",
+                    "configure_params": [],
+                },
+            },
+        },
         "system_high_availability_settings": {
             # Add other mappings here
             "hasync": "hasync",