From 8b32a8dc621cbfb4678a7b545808ffe15a075fd1 Mon Sep 17 00:00:00 2001 From: thomashaw Date: Mon, 1 Aug 2016 18:55:50 +0100 Subject: [PATCH] Feature: Utilities - extracted services which do not run on a network socket e.g. package manager update, firewall rules, java etc. into utilities --- lib/helpers/constants.rb | 2 + lib/objects/module.rb | 2 +- lib/output/xml_report_generator.rb | 2 + lib/readers/module_reader.rb | 5 ++ lib/readers/system_reader.rb | 2 +- lib/schemas/scenario_schema.xsd | 16 ++++ lib/schemas/utility_metadata_schema.xsd | 84 +++++++++++++++++++ lib/templates/Puppetfile.erb | 2 +- lib/templates/Vagrantfile.erb | 2 +- .../unix/{utility => ntp}/ntp/CHANGELOG.md | 0 .../firewall => ntp/ntp}/CONTRIBUTING.md | 0 .../unix/{languages/java => ntp/ntp}/Gemfile | 0 .../unix/{languages/java => ntp/ntp}/LICENSE | 0 .../services/unix/{utility => ntp}/ntp/NOTICE | 0 .../unix/{utility => ntp}/ntp/README.markdown | 0 .../unix/{languages/java => ntp/ntp}/Rakefile | 0 .../unix/{utility => ntp}/ntp/checksums.json | 0 .../puppet/parser/functions/ntp_dirname.rb | 0 .../{utility => ntp}/ntp/manifests/config.pp | 0 .../{utility => ntp}/ntp/manifests/init.pp | 0 .../{utility => ntp}/ntp/manifests/install.pp | 0 .../{utility => ntp}/ntp/manifests/params.pp | 0 .../{utility => ntp}/ntp/manifests/service.pp | 0 .../unix/{utility => ntp}/ntp/metadata.json | 0 .../services/unix/{utility => ntp}/ntp/ntp.pp | 0 .../{utility => ntp}/ntp/secgen_metadata.xml | 2 +- .../ntp/spec/acceptance/class_spec.rb | 0 .../acceptance/disable_monitoring_spec.rb | 0 .../spec/acceptance/nodesets/centos-7-x64.yml | 0 .../spec/acceptance/nodesets/debian-8-x64.yml | 0 .../ntp}/spec/acceptance/nodesets/default.yml | 0 .../acceptance/nodesets/docker/centos-7.yml | 0 .../acceptance/nodesets/docker/debian-8.yml | 0 .../nodesets/docker/ubuntu-14.04.yml | 0 .../ntp/spec/acceptance/ntp_config_spec.rb | 0 .../ntp/spec/acceptance/ntp_install_spec.rb | 0 .../spec/acceptance/ntp_parameters_spec.rb | 0 .../ntp/spec/acceptance/ntp_service_spec.rb | 0 .../spec/acceptance/preferred_servers_spec.rb | 0 .../ntp/spec/acceptance/restrict_spec.rb | 0 .../ntp/spec/acceptance/unsupported_spec.rb | 0 .../ntp/spec/classes/ntp_spec.rb | 0 .../firewall => ntp/ntp}/spec/spec.opts | 0 .../java => ntp/ntp}/spec/spec_helper.rb | 0 .../ntp/spec/spec_helper_acceptance.rb | 0 .../spec/unit/puppet/provider/README.markdown | 0 .../ntp/spec/unit/puppet/type/README.markdown | 0 .../{utility => ntp}/ntp/templates/keys.erb | 0 .../ntp/templates/ntp.conf.erb | 0 .../unix/{utility => ntp}/ntp/tests/init.pp | 0 .../unix/firewall/firewall/CHANGELOG.md | 0 .../unix/firewall/firewall}/CONTRIBUTING.md | 0 .../unix/firewall/firewall/Gemfile | 0 .../unix/firewall/firewall/LICENSE | 0 .../unix/firewall/firewall/README.markdown | 0 .../unix/firewall/firewall/Rakefile | 0 .../unix/firewall/firewall/checksums.json | 0 .../unix/firewall/firewall/firewall.pp | 0 .../firewall/lib/facter/ip6tables_version.rb | 0 .../lib/facter/iptables_persistent_version.rb | 0 .../firewall/lib/facter/iptables_version.rb | 0 .../firewall/lib/puppet/provider/firewall.rb | 0 .../lib/puppet/provider/firewall/ip6tables.rb | 0 .../lib/puppet/provider/firewall/iptables.rb | 0 .../provider/firewallchain/iptables_chain.rb | 0 .../firewall/lib/puppet/type/firewall.rb | 0 .../firewall/lib/puppet/type/firewallchain.rb | 0 .../firewall/lib/puppet/util/firewall.rb | 0 .../firewall/lib/puppet/util/ipcidr.rb | 0 .../unix/firewall/firewall/manifests/init.pp | 0 .../unix/firewall/firewall/manifests/linux.pp | 0 .../firewall/manifests/linux/archlinux.pp | 0 .../firewall/manifests/linux/debian.pp | 0 .../firewall/manifests/linux/gentoo.pp | 0 .../firewall/manifests/linux/redhat.pp | 0 .../firewall/firewall/manifests/params.pp | 0 .../unix/firewall/firewall/metadata.json | 0 .../firewall/firewall/secgen_metadata.xml | 8 +- .../spec/acceptance/change_source_spec.rb | 0 .../firewall/spec/acceptance/class_spec.rb | 0 .../spec/acceptance/connlimit_spec.rb | 0 .../firewall/spec/acceptance/connmark_spec.rb | 0 .../spec/acceptance/firewall_bridging_spec.rb | 0 .../acceptance/firewall_clusterip_spec.rb | 0 .../spec/acceptance/firewall_dscp_spec.rb | 0 .../acceptance/firewall_iptmodules_spec.rb | 0 .../spec/acceptance/firewall_mss_spec.rb | 0 .../firewall/spec/acceptance/firewall_spec.rb | 0 .../spec/acceptance/firewall_tee_spec.rb | 0 .../spec/acceptance/firewall_time_spec.rb | 0 .../spec/acceptance/firewall_uid_spec.rb | 0 .../spec/acceptance/firewallchain_spec.rb | 0 .../firewall/spec/acceptance/invert_spec.rb | 0 .../spec/acceptance/ip6_fragment_spec.rb | 0 .../spec/acceptance/isfragment_spec.rb | 0 .../spec/acceptance/match_mark_spec.rb | 0 .../spec/acceptance/nodesets/centos-7-x64.yml | 0 .../spec/acceptance/nodesets/debian-8-x64.yml | 0 .../spec/acceptance/nodesets/default.yml | 0 .../acceptance/nodesets/docker/centos-7.yml | 0 .../acceptance/nodesets/docker/debian-8.yml | 0 .../nodesets/docker/ubuntu-14.04.yml | 0 .../nodesets/new/aio/debian-8-64mda.yml | 0 .../nodesets/new/aio/redhat-6-64mda.yml | 0 .../nodesets/new/aio/redhat-7-64mda.yml | 0 .../nodesets/new/aio/ubuntu-1404-64mda.yml | 0 .../nodesets/new/pe/centos-5-64mda.yml | 0 .../nodesets/new/pe/centos-6-64mda.yml | 0 .../nodesets/new/pe/centos-7-64mda.yml | 0 .../nodesets/new/pe/debian-6-64mda.yml | 0 .../nodesets/new/pe/debian-7-64mda.yml | 0 .../nodesets/new/pe/debian-8-64mda.yml | 0 .../nodesets/new/pe/oracle-6-64mda.yml | 0 .../nodesets/new/pe/oracle-7-64mda.yml | 0 .../nodesets/new/pe/redhat-5-64mda.yml | 0 .../nodesets/new/pe/redhat-6-64mda.yml | 0 .../nodesets/new/pe/redhat-7-64mda.yml | 0 .../nodesets/new/pe/scientific-5-64mda.yml | 0 .../nodesets/new/pe/scientific-6-64mda.yml | 0 .../nodesets/new/pe/scientific-7-64mda.yml | 0 .../nodesets/new/pe/sles-10-64mda.yml | 0 .../nodesets/new/pe/sles-11-64mda.yml | 0 .../nodesets/new/pe/sles-12-64mda.yml | 0 .../nodesets/new/pe/ubuntu-1004-64mda.yml | 0 .../nodesets/new/pe/ubuntu-1204-64mda.yml | 0 .../nodesets/new/pe/ubuntu-1404-64mda.yml | 0 .../firewall/spec/acceptance/params_spec.rb | 0 .../firewall/spec/acceptance/purge_spec.rb | 0 .../spec/acceptance/resource_cmd_spec.rb | 0 .../firewall/spec/acceptance/rules_spec.rb | 0 .../firewall/spec/acceptance/socket_spec.rb | 0 .../spec/acceptance/standard_usage_spec.rb | 0 .../unix/firewall/firewall}/spec/spec.opts | 0 .../firewall/firewall/spec/spec_helper.rb | 0 .../firewall/spec/spec_helper_acceptance.rb | 0 .../firewall/spec/spec_helper_local.rb | 0 .../classes/firewall_linux_archlinux_spec.rb | 0 .../classes/firewall_linux_debian_spec.rb | 0 .../classes/firewall_linux_gentoo_spec.rb | 0 .../classes/firewall_linux_redhat_spec.rb | 0 .../spec/unit/classes/firewall_linux_spec.rb | 0 .../spec/unit/classes/firewall_spec.rb | 0 .../iptables_persistent_version_spec.rb | 0 .../spec/unit/facter/iptables_spec.rb | 0 .../unit/puppet/provider/ip6tables_spec.rb | 0 .../puppet/provider/iptables_chain_spec.rb | 0 .../unit/puppet/provider/iptables_spec.rb | 0 .../spec/unit/puppet/type/firewall_spec.rb | 0 .../unit/puppet/type/firewallchain_spec.rb | 0 .../spec/unit/puppet/util/firewall_spec.rb | 0 .../spec/unit/puppet/util/ipcidr_spec.rb | 0 .../unix/languages/java/CHANGELOG.md | 0 .../unix/languages/java}/CONTRIBUTING.md | 0 .../unix/languages/java}/Gemfile | 0 .../unix/languages/java}/LICENSE | 0 .../unix/languages/java/NOTICE | 0 .../unix/languages/java/README.markdown | 0 .../unix/languages/java}/Rakefile | 0 .../unix/languages/java/checksums.json | 0 .../unix/languages/java/java.pp | 0 .../java/lib/facter/java_default_home.rb | 0 .../java/lib/facter/java_libjvm_path.rb | 0 .../java/lib/facter/java_major_version.rb | 0 .../java/lib/facter/java_patch_level.rb | 0 .../languages/java/lib/facter/java_version.rb | 0 .../unix/languages/java/manifests/config.pp | 0 .../unix/languages/java/manifests/init.pp | 0 .../unix/languages/java/manifests/oracle.pp | 0 .../unix/languages/java/manifests/params.pp | 0 .../unix/languages/java/metadata.json | 0 .../unix/languages/java/secgen_metadata.xml | 6 +- .../java/spec/acceptance/install_spec.rb | 0 .../acceptance/nodesets/centos-5-vcloud.yml | 0 .../acceptance/nodesets/centos-59-x64-pe.yml | 0 .../acceptance/nodesets/centos-59-x64.yml | 0 .../acceptance/nodesets/centos-6-vcloud.yml | 0 .../nodesets/centos-64-x64-fusion.yml | 0 .../acceptance/nodesets/centos-64-x64-pe.yml | 0 .../acceptance/nodesets/centos-64-x64.yml | 0 .../acceptance/nodesets/centos-65-x64.yml | 0 .../acceptance/nodesets/centos-7-vcloud.yml | 0 .../acceptance/nodesets/debian-6-vcloud.yml | 0 .../acceptance/nodesets/debian-607-x64.yml | 0 .../acceptance/nodesets/debian-7-vcloud.yml | 0 .../acceptance/nodesets/debian-70rc1-x64.yml | 0 .../java/spec/acceptance/nodesets/default.yml | 0 .../acceptance/nodesets/fedora-18-x64.yml | 0 .../acceptance/nodesets/redhat-7-vcloud.yml | 0 .../acceptance/nodesets/sles-11-vcloud.yml | 0 .../acceptance/nodesets/sles-11sp1-x64.yml | 0 .../acceptance/nodesets/solaris-11-vcloud.yml | 0 .../nodesets/ubuntu-1004-vcloud.yml | 0 .../nodesets/ubuntu-1404-vcloud.yml | 0 .../nodesets/ubuntu-server-10044-x64.yml | 0 .../nodesets/ubuntu-server-12042-x64.yml | 0 .../nodesets/ubuntu-server-1404-x64.yml | 0 .../nodesets/ubuntu-server-1504-x64.yml | 0 .../languages/java/spec/classes/java_spec.rb | 0 .../java/spec/defines/oracle_spec.rb | 0 .../unix/languages/java}/spec/spec.opts | 0 .../unix/languages/java}/spec/spec_helper.rb | 0 .../java/spec/spec_helper_acceptance.rb | 0 .../unit/facter/java_default_home_spec.rb | 0 .../spec/unit/facter/java_libjvm_path_spec.rb | 0 .../unit/facter/java_major_version_spec.rb | 0 .../spec/unit/facter/java_patch_level_spec.rb | 0 .../spec/unit/facter/java_version_spec.rb | 0 .../unix/languages/java/tests/alternative.pp | 0 .../unix/languages/java/tests/init.pp | 0 .../unix/languages/java/tests/oracle.pp | 0 .../unix/update/unix_update/manifests/unix.pp | 0 .../update/unix_update/secgen_metadata.xml | 7 +- .../unix/update/unix_update/unix_update.pp | 0 .../clean_system_with_update_unix.xml | 2 +- .../firewall_configuration_example.xml | 2 +- scenarios/simple_examples/java_service.xml | 2 +- scenarios/simple_examples/ntp_service.xml | 2 +- secgen.rb | 6 +- 218 files changed, 132 insertions(+), 22 deletions(-) create mode 100644 lib/schemas/utility_metadata_schema.xsd rename modules/services/unix/{utility => ntp}/ntp/CHANGELOG.md (100%) rename modules/services/unix/{firewall/firewall => ntp/ntp}/CONTRIBUTING.md (100%) rename modules/services/unix/{languages/java => ntp/ntp}/Gemfile (100%) rename modules/services/unix/{languages/java => ntp/ntp}/LICENSE (100%) rename modules/services/unix/{utility => ntp}/ntp/NOTICE (100%) rename modules/services/unix/{utility => ntp}/ntp/README.markdown (100%) rename modules/services/unix/{languages/java => ntp/ntp}/Rakefile (100%) rename modules/services/unix/{utility => ntp}/ntp/checksums.json (100%) rename modules/services/unix/{utility => ntp}/ntp/lib/puppet/parser/functions/ntp_dirname.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/manifests/config.pp (100%) rename modules/services/unix/{utility => ntp}/ntp/manifests/init.pp (100%) rename modules/services/unix/{utility => ntp}/ntp/manifests/install.pp (100%) rename modules/services/unix/{utility => ntp}/ntp/manifests/params.pp (100%) rename modules/services/unix/{utility => ntp}/ntp/manifests/service.pp (100%) rename modules/services/unix/{utility => ntp}/ntp/metadata.json (100%) rename modules/services/unix/{utility => ntp}/ntp/ntp.pp (100%) rename modules/services/unix/{utility => ntp}/ntp/secgen_metadata.xml (96%) rename modules/services/unix/{utility => ntp}/ntp/spec/acceptance/class_spec.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/acceptance/disable_monitoring_spec.rb (100%) rename modules/services/unix/{firewall/firewall => ntp/ntp}/spec/acceptance/nodesets/centos-7-x64.yml (100%) rename modules/services/unix/{firewall/firewall => ntp/ntp}/spec/acceptance/nodesets/debian-8-x64.yml (100%) rename modules/services/unix/{firewall/firewall => ntp/ntp}/spec/acceptance/nodesets/default.yml (100%) rename modules/services/unix/{firewall/firewall => ntp/ntp}/spec/acceptance/nodesets/docker/centos-7.yml (100%) rename modules/services/unix/{firewall/firewall => ntp/ntp}/spec/acceptance/nodesets/docker/debian-8.yml (100%) rename modules/services/unix/{firewall/firewall => ntp/ntp}/spec/acceptance/nodesets/docker/ubuntu-14.04.yml (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/acceptance/ntp_config_spec.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/acceptance/ntp_install_spec.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/acceptance/ntp_parameters_spec.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/acceptance/ntp_service_spec.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/acceptance/preferred_servers_spec.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/acceptance/restrict_spec.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/acceptance/unsupported_spec.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/classes/ntp_spec.rb (100%) rename modules/services/unix/{firewall/firewall => ntp/ntp}/spec/spec.opts (100%) rename modules/services/unix/{languages/java => ntp/ntp}/spec/spec_helper.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/spec_helper_acceptance.rb (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/unit/puppet/provider/README.markdown (100%) rename modules/services/unix/{utility => ntp}/ntp/spec/unit/puppet/type/README.markdown (100%) rename modules/services/unix/{utility => ntp}/ntp/templates/keys.erb (100%) rename modules/services/unix/{utility => ntp}/ntp/templates/ntp.conf.erb (100%) rename modules/services/unix/{utility => ntp}/ntp/tests/init.pp (100%) rename modules/{services => utilities}/unix/firewall/firewall/CHANGELOG.md (100%) rename modules/{services/unix/languages/java => utilities/unix/firewall/firewall}/CONTRIBUTING.md (100%) rename modules/{services => utilities}/unix/firewall/firewall/Gemfile (100%) rename modules/{services => utilities}/unix/firewall/firewall/LICENSE (100%) rename modules/{services => utilities}/unix/firewall/firewall/README.markdown (100%) rename modules/{services => utilities}/unix/firewall/firewall/Rakefile (100%) rename modules/{services => utilities}/unix/firewall/firewall/checksums.json (100%) rename modules/{services => utilities}/unix/firewall/firewall/firewall.pp (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/facter/ip6tables_version.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/facter/iptables_persistent_version.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/facter/iptables_version.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/puppet/provider/firewall.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/puppet/provider/firewall/ip6tables.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/puppet/provider/firewall/iptables.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/puppet/type/firewall.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/puppet/type/firewallchain.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/puppet/util/firewall.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/lib/puppet/util/ipcidr.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/manifests/init.pp (100%) rename modules/{services => utilities}/unix/firewall/firewall/manifests/linux.pp (100%) rename modules/{services => utilities}/unix/firewall/firewall/manifests/linux/archlinux.pp (100%) rename modules/{services => utilities}/unix/firewall/firewall/manifests/linux/debian.pp (100%) rename modules/{services => utilities}/unix/firewall/firewall/manifests/linux/gentoo.pp (100%) rename modules/{services => utilities}/unix/firewall/firewall/manifests/linux/redhat.pp (100%) rename modules/{services => utilities}/unix/firewall/firewall/manifests/params.pp (100%) rename modules/{services => utilities}/unix/firewall/firewall/metadata.json (100%) rename modules/{services => utilities}/unix/firewall/firewall/secgen_metadata.xml (79%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/change_source_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/class_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/connlimit_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/connmark_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/firewall_bridging_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/firewall_clusterip_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/firewall_dscp_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/firewall_iptmodules_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/firewall_mss_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/firewall_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/firewall_tee_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/firewall_time_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/firewall_uid_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/firewallchain_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/invert_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/ip6_fragment_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/isfragment_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/match_mark_spec.rb (100%) rename modules/{services/unix/utility/ntp => utilities/unix/firewall/firewall}/spec/acceptance/nodesets/centos-7-x64.yml (100%) rename modules/{services/unix/utility/ntp => utilities/unix/firewall/firewall}/spec/acceptance/nodesets/debian-8-x64.yml (100%) rename modules/{services/unix/utility/ntp => utilities/unix/firewall/firewall}/spec/acceptance/nodesets/default.yml (100%) rename modules/{services/unix/utility/ntp => utilities/unix/firewall/firewall}/spec/acceptance/nodesets/docker/centos-7.yml (100%) rename modules/{services/unix/utility/ntp => utilities/unix/firewall/firewall}/spec/acceptance/nodesets/docker/debian-8.yml (100%) rename modules/{services/unix/utility/ntp => utilities/unix/firewall/firewall}/spec/acceptance/nodesets/docker/ubuntu-14.04.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/params_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/purge_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/resource_cmd_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/rules_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/socket_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/acceptance/standard_usage_spec.rb (100%) rename modules/{services/unix/languages/java => utilities/unix/firewall/firewall}/spec/spec.opts (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/spec_helper.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/spec_helper_acceptance.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/spec_helper_local.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/classes/firewall_linux_debian_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/classes/firewall_linux_gentoo_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/classes/firewall_linux_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/classes/firewall_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/facter/iptables_persistent_version_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/facter/iptables_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/puppet/provider/ip6tables_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/puppet/provider/iptables_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/puppet/type/firewall_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/puppet/type/firewallchain_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/puppet/util/firewall_spec.rb (100%) rename modules/{services => utilities}/unix/firewall/firewall/spec/unit/puppet/util/ipcidr_spec.rb (100%) rename modules/{services => utilities}/unix/languages/java/CHANGELOG.md (100%) rename modules/{services/unix/utility/ntp => utilities/unix/languages/java}/CONTRIBUTING.md (100%) rename modules/{services/unix/utility/ntp => utilities/unix/languages/java}/Gemfile (100%) rename modules/{services/unix/utility/ntp => utilities/unix/languages/java}/LICENSE (100%) rename modules/{services => utilities}/unix/languages/java/NOTICE (100%) rename modules/{services => utilities}/unix/languages/java/README.markdown (100%) rename modules/{services/unix/utility/ntp => utilities/unix/languages/java}/Rakefile (100%) rename modules/{services => utilities}/unix/languages/java/checksums.json (100%) rename modules/{services => utilities}/unix/languages/java/java.pp (100%) rename modules/{services => utilities}/unix/languages/java/lib/facter/java_default_home.rb (100%) rename modules/{services => utilities}/unix/languages/java/lib/facter/java_libjvm_path.rb (100%) rename modules/{services => utilities}/unix/languages/java/lib/facter/java_major_version.rb (100%) rename modules/{services => utilities}/unix/languages/java/lib/facter/java_patch_level.rb (100%) rename modules/{services => utilities}/unix/languages/java/lib/facter/java_version.rb (100%) rename modules/{services => utilities}/unix/languages/java/manifests/config.pp (100%) rename modules/{services => utilities}/unix/languages/java/manifests/init.pp (100%) rename modules/{services => utilities}/unix/languages/java/manifests/oracle.pp (100%) rename modules/{services => utilities}/unix/languages/java/manifests/params.pp (100%) rename modules/{services => utilities}/unix/languages/java/metadata.json (100%) rename modules/{services => utilities}/unix/languages/java/secgen_metadata.xml (81%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/install_spec.rb (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/centos-5-vcloud.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/centos-59-x64-pe.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/centos-59-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/centos-6-vcloud.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/centos-64-x64-fusion.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/centos-64-x64-pe.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/centos-64-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/centos-65-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/centos-7-vcloud.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/debian-6-vcloud.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/debian-607-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/debian-7-vcloud.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/debian-70rc1-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/default.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/fedora-18-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/redhat-7-vcloud.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/sles-11-vcloud.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/sles-11sp1-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/solaris-11-vcloud.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/ubuntu-1004-vcloud.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/ubuntu-1404-vcloud.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-1504-x64.yml (100%) rename modules/{services => utilities}/unix/languages/java/spec/classes/java_spec.rb (100%) rename modules/{services => utilities}/unix/languages/java/spec/defines/oracle_spec.rb (100%) rename modules/{services/unix/utility/ntp => utilities/unix/languages/java}/spec/spec.opts (100%) rename modules/{services/unix/utility/ntp => utilities/unix/languages/java}/spec/spec_helper.rb (100%) rename modules/{services => utilities}/unix/languages/java/spec/spec_helper_acceptance.rb (100%) rename modules/{services => utilities}/unix/languages/java/spec/unit/facter/java_default_home_spec.rb (100%) rename modules/{services => utilities}/unix/languages/java/spec/unit/facter/java_libjvm_path_spec.rb (100%) rename modules/{services => utilities}/unix/languages/java/spec/unit/facter/java_major_version_spec.rb (100%) rename modules/{services => utilities}/unix/languages/java/spec/unit/facter/java_patch_level_spec.rb (100%) rename modules/{services => utilities}/unix/languages/java/spec/unit/facter/java_version_spec.rb (100%) rename modules/{services => utilities}/unix/languages/java/tests/alternative.pp (100%) rename modules/{services => utilities}/unix/languages/java/tests/init.pp (100%) rename modules/{services => utilities}/unix/languages/java/tests/oracle.pp (100%) rename modules/{services => utilities}/unix/update/unix_update/manifests/unix.pp (100%) rename modules/{services => utilities}/unix/update/unix_update/secgen_metadata.xml (75%) rename modules/{services => utilities}/unix/update/unix_update/unix_update.pp (100%) diff --git a/lib/helpers/constants.rb b/lib/helpers/constants.rb index b16795565..90267d0e1 100644 --- a/lib/helpers/constants.rb +++ b/lib/helpers/constants.rb @@ -10,6 +10,7 @@ SCENARIO_XML = "#{ROOT_DIR}/scenarios/default_scenario.xml" SCENARIO_SCHEMA_FILE = "#{ROOT_DIR}/lib/schemas/scenario_schema.xsd" VULNERABILITY_SCHEMA_FILE = "#{ROOT_DIR}/lib/schemas/vulnerability_metadata_schema.xsd" SERVICE_SCHEMA_FILE = "#{ROOT_DIR}/lib/schemas/service_metadata_schema.xsd" +UTILITY_SCHEMA_FILE = "#{ROOT_DIR}/lib/schemas/utility_metadata_schema.xsd" NETWORK_SCHEMA_FILE = "#{ROOT_DIR}/lib/schemas/network_metadata_schema.xsd" BASE_SCHEMA_FILE = "#{ROOT_DIR}/lib/schemas/base_metadata_schema.xsd" @@ -26,6 +27,7 @@ ENVIRONMENTS_PATH = "#{ROOT_DIR}/modules/build/environments" MODULES_PATH = "#{ROOT_DIR}/modules/" VULNERABILITIES_PATH = "#{MODULES_PATH}vulnerabilities/" SERVICES_PATH = "#{MODULES_PATH}services/" +UTILITIES_PATH = "#{MODULES_PATH}utilities/" NETWORKS_PATH = "#{MODULES_PATH}networks/" BASES_PATH = "#{MODULES_PATH}bases/" diff --git a/lib/objects/module.rb b/lib/objects/module.rb index bbff7f0b5..c1c553f05 100644 --- a/lib/objects/module.rb +++ b/lib/objects/module.rb @@ -3,7 +3,7 @@ require_relative '../helpers/constants.rb' class Module #Vulnerability attributes hash attr_accessor :module_path # vulnerabilities/unix/ftp/vsftp_234_backdoor - attr_accessor :module_type # vulnerability|service + attr_accessor :module_type # vulnerability|service|utility attr_accessor :attributes # attributes are hashes that contain arrays of values # Each attribute is stored in a hash containing an array of values (because elements such as author can repeat). # Module *selectors*, store filters in the attributes hash. diff --git a/lib/output/xml_report_generator.rb b/lib/output/xml_report_generator.rb index 5948cce01..a33a42600 100644 --- a/lib/output/xml_report_generator.rb +++ b/lib/output/xml_report_generator.rb @@ -38,6 +38,8 @@ class XMLReportGenerator xml.base(selected_module.attributes_for_scenario_output) when 'service' xml.service(selected_module.attributes_for_scenario_output) + when 'utility' + xml.utility(selected_module.attributes_for_scenario_output) when 'network' xml.network(selected_module.attributes_for_scenario_output) else diff --git a/lib/readers/module_reader.rb b/lib/readers/module_reader.rb index 2c243f5ed..0f59c745d 100644 --- a/lib/readers/module_reader.rb +++ b/lib/readers/module_reader.rb @@ -20,6 +20,11 @@ class ModuleReader return read_modules('service', SERVICES_PATH, SERVICE_SCHEMA_FILE, true) end + # reads in all utilities + def self.read_utilities + return read_modules('utility', UTILITIES_PATH, UTILITY_SCHEMA_FILE, true) + end + # reads in all networks def self.read_networks return read_modules('network', NETWORKS_PATH, NETWORK_SCHEMA_FILE, false) diff --git a/lib/readers/system_reader.rb b/lib/readers/system_reader.rb index 4a5c9c41d..c7dc81b18 100644 --- a/lib/readers/system_reader.rb +++ b/lib/readers/system_reader.rb @@ -50,7 +50,7 @@ class SystemReader end # for each module selection - system_node.xpath('vulnerability | service | network | base').each do |module_node| + system_node.xpath('vulnerability | service | utility | network | base').each do |module_node| # create a selector module, which is a regular module instance used as a placeholder for matching requirements module_selector = Module.new(module_node.name) module_node.xpath('@*').each do |attr| diff --git a/lib/schemas/scenario_schema.xsd b/lib/schemas/scenario_schema.xsd index ef970f142..98cf7d8c6 100644 --- a/lib/schemas/scenario_schema.xsd +++ b/lib/schemas/scenario_schema.xsd @@ -24,6 +24,7 @@ + @@ -91,6 +92,21 @@ + + + + + + + + + + + + + + + diff --git a/lib/schemas/utility_metadata_schema.xsd b/lib/schemas/utility_metadata_schema.xsd new file mode 100644 index 000000000..2714ac8cc --- /dev/null +++ b/lib/schemas/utility_metadata_schema.xsd @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/templates/Puppetfile.erb b/lib/templates/Puppetfile.erb index ae9eb2d39..2c260bf32 100644 --- a/lib/templates/Puppetfile.erb +++ b/lib/templates/Puppetfile.erb @@ -11,7 +11,7 @@ forge "https://forgeapi.puppetlabs.com" <% @currently_processing_system.module_selections.each do |selected_module| -%> <% case selected_module.module_type - when 'vulnerability', 'service' -%> + when 'vulnerability', 'service', 'utility' -%> mod 'SecGen-<%= selected_module.module_path_name %>/<%= selected_module.module_path_end %>', :path => '<%="#{ROOT_DIR}/#{selected_module.module_path}"%>' <% end -%> <% end -%> diff --git a/lib/templates/Vagrantfile.erb b/lib/templates/Vagrantfile.erb index 377a30bc8..31d6676f2 100644 --- a/lib/templates/Vagrantfile.erb +++ b/lib/templates/Vagrantfile.erb @@ -28,7 +28,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| <% else -%> <%= system.name %>.vm.network :<%= selected_module.attributes['type'][0] %>, ip: "<%= selected_module.attributes['range'][0] %>" <% end -%> -<% when 'vulnerability', 'service' -%> +<% when 'vulnerability', 'service', 'utility' -%> <% module_name = selected_module.module_path_name -%> <%= system.name %>.vm.provision "puppet" do | <%=module_name%> | <%=module_name%>.module_path = "<%="puppet/#{system.name}/modules"%>" diff --git a/modules/services/unix/utility/ntp/CHANGELOG.md b/modules/services/unix/ntp/ntp/CHANGELOG.md similarity index 100% rename from modules/services/unix/utility/ntp/CHANGELOG.md rename to modules/services/unix/ntp/ntp/CHANGELOG.md diff --git a/modules/services/unix/firewall/firewall/CONTRIBUTING.md b/modules/services/unix/ntp/ntp/CONTRIBUTING.md similarity index 100% rename from modules/services/unix/firewall/firewall/CONTRIBUTING.md rename to modules/services/unix/ntp/ntp/CONTRIBUTING.md diff --git a/modules/services/unix/languages/java/Gemfile b/modules/services/unix/ntp/ntp/Gemfile similarity index 100% rename from modules/services/unix/languages/java/Gemfile rename to modules/services/unix/ntp/ntp/Gemfile diff --git a/modules/services/unix/languages/java/LICENSE b/modules/services/unix/ntp/ntp/LICENSE similarity index 100% rename from modules/services/unix/languages/java/LICENSE rename to modules/services/unix/ntp/ntp/LICENSE diff --git a/modules/services/unix/utility/ntp/NOTICE b/modules/services/unix/ntp/ntp/NOTICE similarity index 100% rename from modules/services/unix/utility/ntp/NOTICE rename to modules/services/unix/ntp/ntp/NOTICE diff --git a/modules/services/unix/utility/ntp/README.markdown b/modules/services/unix/ntp/ntp/README.markdown similarity index 100% rename from modules/services/unix/utility/ntp/README.markdown rename to modules/services/unix/ntp/ntp/README.markdown diff --git a/modules/services/unix/languages/java/Rakefile b/modules/services/unix/ntp/ntp/Rakefile similarity index 100% rename from modules/services/unix/languages/java/Rakefile rename to modules/services/unix/ntp/ntp/Rakefile diff --git a/modules/services/unix/utility/ntp/checksums.json b/modules/services/unix/ntp/ntp/checksums.json similarity index 100% rename from modules/services/unix/utility/ntp/checksums.json rename to modules/services/unix/ntp/ntp/checksums.json diff --git a/modules/services/unix/utility/ntp/lib/puppet/parser/functions/ntp_dirname.rb b/modules/services/unix/ntp/ntp/lib/puppet/parser/functions/ntp_dirname.rb similarity index 100% rename from modules/services/unix/utility/ntp/lib/puppet/parser/functions/ntp_dirname.rb rename to modules/services/unix/ntp/ntp/lib/puppet/parser/functions/ntp_dirname.rb diff --git a/modules/services/unix/utility/ntp/manifests/config.pp b/modules/services/unix/ntp/ntp/manifests/config.pp similarity index 100% rename from modules/services/unix/utility/ntp/manifests/config.pp rename to modules/services/unix/ntp/ntp/manifests/config.pp diff --git a/modules/services/unix/utility/ntp/manifests/init.pp b/modules/services/unix/ntp/ntp/manifests/init.pp similarity index 100% rename from modules/services/unix/utility/ntp/manifests/init.pp rename to modules/services/unix/ntp/ntp/manifests/init.pp diff --git a/modules/services/unix/utility/ntp/manifests/install.pp b/modules/services/unix/ntp/ntp/manifests/install.pp similarity index 100% rename from modules/services/unix/utility/ntp/manifests/install.pp rename to modules/services/unix/ntp/ntp/manifests/install.pp diff --git a/modules/services/unix/utility/ntp/manifests/params.pp b/modules/services/unix/ntp/ntp/manifests/params.pp similarity index 100% rename from modules/services/unix/utility/ntp/manifests/params.pp rename to modules/services/unix/ntp/ntp/manifests/params.pp diff --git a/modules/services/unix/utility/ntp/manifests/service.pp b/modules/services/unix/ntp/ntp/manifests/service.pp similarity index 100% rename from modules/services/unix/utility/ntp/manifests/service.pp rename to modules/services/unix/ntp/ntp/manifests/service.pp diff --git a/modules/services/unix/utility/ntp/metadata.json b/modules/services/unix/ntp/ntp/metadata.json similarity index 100% rename from modules/services/unix/utility/ntp/metadata.json rename to modules/services/unix/ntp/ntp/metadata.json diff --git a/modules/services/unix/utility/ntp/ntp.pp b/modules/services/unix/ntp/ntp/ntp.pp similarity index 100% rename from modules/services/unix/utility/ntp/ntp.pp rename to modules/services/unix/ntp/ntp/ntp.pp diff --git a/modules/services/unix/utility/ntp/secgen_metadata.xml b/modules/services/unix/ntp/ntp/secgen_metadata.xml similarity index 96% rename from modules/services/unix/utility/ntp/secgen_metadata.xml rename to modules/services/unix/ntp/ntp/secgen_metadata.xml index f553b378d..1f326ac64 100644 --- a/modules/services/unix/utility/ntp/secgen_metadata.xml +++ b/modules/services/unix/ntp/ntp/secgen_metadata.xml @@ -9,7 +9,7 @@ Apache v2 An ntp installation - utility + ntp linux diff --git a/modules/services/unix/utility/ntp/spec/acceptance/class_spec.rb b/modules/services/unix/ntp/ntp/spec/acceptance/class_spec.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/class_spec.rb rename to modules/services/unix/ntp/ntp/spec/acceptance/class_spec.rb diff --git a/modules/services/unix/utility/ntp/spec/acceptance/disable_monitoring_spec.rb b/modules/services/unix/ntp/ntp/spec/acceptance/disable_monitoring_spec.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/disable_monitoring_spec.rb rename to modules/services/unix/ntp/ntp/spec/acceptance/disable_monitoring_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/centos-7-x64.yml b/modules/services/unix/ntp/ntp/spec/acceptance/nodesets/centos-7-x64.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/centos-7-x64.yml rename to modules/services/unix/ntp/ntp/spec/acceptance/nodesets/centos-7-x64.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/debian-8-x64.yml b/modules/services/unix/ntp/ntp/spec/acceptance/nodesets/debian-8-x64.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/debian-8-x64.yml rename to modules/services/unix/ntp/ntp/spec/acceptance/nodesets/debian-8-x64.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/default.yml b/modules/services/unix/ntp/ntp/spec/acceptance/nodesets/default.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/default.yml rename to modules/services/unix/ntp/ntp/spec/acceptance/nodesets/default.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/docker/centos-7.yml b/modules/services/unix/ntp/ntp/spec/acceptance/nodesets/docker/centos-7.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/docker/centos-7.yml rename to modules/services/unix/ntp/ntp/spec/acceptance/nodesets/docker/centos-7.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/docker/debian-8.yml b/modules/services/unix/ntp/ntp/spec/acceptance/nodesets/docker/debian-8.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/docker/debian-8.yml rename to modules/services/unix/ntp/ntp/spec/acceptance/nodesets/docker/debian-8.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/modules/services/unix/ntp/ntp/spec/acceptance/nodesets/docker/ubuntu-14.04.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/docker/ubuntu-14.04.yml rename to modules/services/unix/ntp/ntp/spec/acceptance/nodesets/docker/ubuntu-14.04.yml diff --git a/modules/services/unix/utility/ntp/spec/acceptance/ntp_config_spec.rb b/modules/services/unix/ntp/ntp/spec/acceptance/ntp_config_spec.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/ntp_config_spec.rb rename to modules/services/unix/ntp/ntp/spec/acceptance/ntp_config_spec.rb diff --git a/modules/services/unix/utility/ntp/spec/acceptance/ntp_install_spec.rb b/modules/services/unix/ntp/ntp/spec/acceptance/ntp_install_spec.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/ntp_install_spec.rb rename to modules/services/unix/ntp/ntp/spec/acceptance/ntp_install_spec.rb diff --git a/modules/services/unix/utility/ntp/spec/acceptance/ntp_parameters_spec.rb b/modules/services/unix/ntp/ntp/spec/acceptance/ntp_parameters_spec.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/ntp_parameters_spec.rb rename to modules/services/unix/ntp/ntp/spec/acceptance/ntp_parameters_spec.rb diff --git a/modules/services/unix/utility/ntp/spec/acceptance/ntp_service_spec.rb b/modules/services/unix/ntp/ntp/spec/acceptance/ntp_service_spec.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/ntp_service_spec.rb rename to modules/services/unix/ntp/ntp/spec/acceptance/ntp_service_spec.rb diff --git a/modules/services/unix/utility/ntp/spec/acceptance/preferred_servers_spec.rb b/modules/services/unix/ntp/ntp/spec/acceptance/preferred_servers_spec.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/preferred_servers_spec.rb rename to modules/services/unix/ntp/ntp/spec/acceptance/preferred_servers_spec.rb diff --git a/modules/services/unix/utility/ntp/spec/acceptance/restrict_spec.rb b/modules/services/unix/ntp/ntp/spec/acceptance/restrict_spec.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/restrict_spec.rb rename to modules/services/unix/ntp/ntp/spec/acceptance/restrict_spec.rb diff --git a/modules/services/unix/utility/ntp/spec/acceptance/unsupported_spec.rb b/modules/services/unix/ntp/ntp/spec/acceptance/unsupported_spec.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/unsupported_spec.rb rename to modules/services/unix/ntp/ntp/spec/acceptance/unsupported_spec.rb diff --git a/modules/services/unix/utility/ntp/spec/classes/ntp_spec.rb b/modules/services/unix/ntp/ntp/spec/classes/ntp_spec.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/classes/ntp_spec.rb rename to modules/services/unix/ntp/ntp/spec/classes/ntp_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/spec.opts b/modules/services/unix/ntp/ntp/spec/spec.opts similarity index 100% rename from modules/services/unix/firewall/firewall/spec/spec.opts rename to modules/services/unix/ntp/ntp/spec/spec.opts diff --git a/modules/services/unix/languages/java/spec/spec_helper.rb b/modules/services/unix/ntp/ntp/spec/spec_helper.rb similarity index 100% rename from modules/services/unix/languages/java/spec/spec_helper.rb rename to modules/services/unix/ntp/ntp/spec/spec_helper.rb diff --git a/modules/services/unix/utility/ntp/spec/spec_helper_acceptance.rb b/modules/services/unix/ntp/ntp/spec/spec_helper_acceptance.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/spec_helper_acceptance.rb rename to modules/services/unix/ntp/ntp/spec/spec_helper_acceptance.rb diff --git a/modules/services/unix/utility/ntp/spec/unit/puppet/provider/README.markdown b/modules/services/unix/ntp/ntp/spec/unit/puppet/provider/README.markdown similarity index 100% rename from modules/services/unix/utility/ntp/spec/unit/puppet/provider/README.markdown rename to modules/services/unix/ntp/ntp/spec/unit/puppet/provider/README.markdown diff --git a/modules/services/unix/utility/ntp/spec/unit/puppet/type/README.markdown b/modules/services/unix/ntp/ntp/spec/unit/puppet/type/README.markdown similarity index 100% rename from modules/services/unix/utility/ntp/spec/unit/puppet/type/README.markdown rename to modules/services/unix/ntp/ntp/spec/unit/puppet/type/README.markdown diff --git a/modules/services/unix/utility/ntp/templates/keys.erb b/modules/services/unix/ntp/ntp/templates/keys.erb similarity index 100% rename from modules/services/unix/utility/ntp/templates/keys.erb rename to modules/services/unix/ntp/ntp/templates/keys.erb diff --git a/modules/services/unix/utility/ntp/templates/ntp.conf.erb b/modules/services/unix/ntp/ntp/templates/ntp.conf.erb similarity index 100% rename from modules/services/unix/utility/ntp/templates/ntp.conf.erb rename to modules/services/unix/ntp/ntp/templates/ntp.conf.erb diff --git a/modules/services/unix/utility/ntp/tests/init.pp b/modules/services/unix/ntp/ntp/tests/init.pp similarity index 100% rename from modules/services/unix/utility/ntp/tests/init.pp rename to modules/services/unix/ntp/ntp/tests/init.pp diff --git a/modules/services/unix/firewall/firewall/CHANGELOG.md b/modules/utilities/unix/firewall/firewall/CHANGELOG.md similarity index 100% rename from modules/services/unix/firewall/firewall/CHANGELOG.md rename to modules/utilities/unix/firewall/firewall/CHANGELOG.md diff --git a/modules/services/unix/languages/java/CONTRIBUTING.md b/modules/utilities/unix/firewall/firewall/CONTRIBUTING.md similarity index 100% rename from modules/services/unix/languages/java/CONTRIBUTING.md rename to modules/utilities/unix/firewall/firewall/CONTRIBUTING.md diff --git a/modules/services/unix/firewall/firewall/Gemfile b/modules/utilities/unix/firewall/firewall/Gemfile similarity index 100% rename from modules/services/unix/firewall/firewall/Gemfile rename to modules/utilities/unix/firewall/firewall/Gemfile diff --git a/modules/services/unix/firewall/firewall/LICENSE b/modules/utilities/unix/firewall/firewall/LICENSE similarity index 100% rename from modules/services/unix/firewall/firewall/LICENSE rename to modules/utilities/unix/firewall/firewall/LICENSE diff --git a/modules/services/unix/firewall/firewall/README.markdown b/modules/utilities/unix/firewall/firewall/README.markdown similarity index 100% rename from modules/services/unix/firewall/firewall/README.markdown rename to modules/utilities/unix/firewall/firewall/README.markdown diff --git a/modules/services/unix/firewall/firewall/Rakefile b/modules/utilities/unix/firewall/firewall/Rakefile similarity index 100% rename from modules/services/unix/firewall/firewall/Rakefile rename to modules/utilities/unix/firewall/firewall/Rakefile diff --git a/modules/services/unix/firewall/firewall/checksums.json b/modules/utilities/unix/firewall/firewall/checksums.json similarity index 100% rename from modules/services/unix/firewall/firewall/checksums.json rename to modules/utilities/unix/firewall/firewall/checksums.json diff --git a/modules/services/unix/firewall/firewall/firewall.pp b/modules/utilities/unix/firewall/firewall/firewall.pp similarity index 100% rename from modules/services/unix/firewall/firewall/firewall.pp rename to modules/utilities/unix/firewall/firewall/firewall.pp diff --git a/modules/services/unix/firewall/firewall/lib/facter/ip6tables_version.rb b/modules/utilities/unix/firewall/firewall/lib/facter/ip6tables_version.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/facter/ip6tables_version.rb rename to modules/utilities/unix/firewall/firewall/lib/facter/ip6tables_version.rb diff --git a/modules/services/unix/firewall/firewall/lib/facter/iptables_persistent_version.rb b/modules/utilities/unix/firewall/firewall/lib/facter/iptables_persistent_version.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/facter/iptables_persistent_version.rb rename to modules/utilities/unix/firewall/firewall/lib/facter/iptables_persistent_version.rb diff --git a/modules/services/unix/firewall/firewall/lib/facter/iptables_version.rb b/modules/utilities/unix/firewall/firewall/lib/facter/iptables_version.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/facter/iptables_version.rb rename to modules/utilities/unix/firewall/firewall/lib/facter/iptables_version.rb diff --git a/modules/services/unix/firewall/firewall/lib/puppet/provider/firewall.rb b/modules/utilities/unix/firewall/firewall/lib/puppet/provider/firewall.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/puppet/provider/firewall.rb rename to modules/utilities/unix/firewall/firewall/lib/puppet/provider/firewall.rb diff --git a/modules/services/unix/firewall/firewall/lib/puppet/provider/firewall/ip6tables.rb b/modules/utilities/unix/firewall/firewall/lib/puppet/provider/firewall/ip6tables.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/puppet/provider/firewall/ip6tables.rb rename to modules/utilities/unix/firewall/firewall/lib/puppet/provider/firewall/ip6tables.rb diff --git a/modules/services/unix/firewall/firewall/lib/puppet/provider/firewall/iptables.rb b/modules/utilities/unix/firewall/firewall/lib/puppet/provider/firewall/iptables.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/puppet/provider/firewall/iptables.rb rename to modules/utilities/unix/firewall/firewall/lib/puppet/provider/firewall/iptables.rb diff --git a/modules/services/unix/firewall/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb b/modules/utilities/unix/firewall/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb rename to modules/utilities/unix/firewall/firewall/lib/puppet/provider/firewallchain/iptables_chain.rb diff --git a/modules/services/unix/firewall/firewall/lib/puppet/type/firewall.rb b/modules/utilities/unix/firewall/firewall/lib/puppet/type/firewall.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/puppet/type/firewall.rb rename to modules/utilities/unix/firewall/firewall/lib/puppet/type/firewall.rb diff --git a/modules/services/unix/firewall/firewall/lib/puppet/type/firewallchain.rb b/modules/utilities/unix/firewall/firewall/lib/puppet/type/firewallchain.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/puppet/type/firewallchain.rb rename to modules/utilities/unix/firewall/firewall/lib/puppet/type/firewallchain.rb diff --git a/modules/services/unix/firewall/firewall/lib/puppet/util/firewall.rb b/modules/utilities/unix/firewall/firewall/lib/puppet/util/firewall.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/puppet/util/firewall.rb rename to modules/utilities/unix/firewall/firewall/lib/puppet/util/firewall.rb diff --git a/modules/services/unix/firewall/firewall/lib/puppet/util/ipcidr.rb b/modules/utilities/unix/firewall/firewall/lib/puppet/util/ipcidr.rb similarity index 100% rename from modules/services/unix/firewall/firewall/lib/puppet/util/ipcidr.rb rename to modules/utilities/unix/firewall/firewall/lib/puppet/util/ipcidr.rb diff --git a/modules/services/unix/firewall/firewall/manifests/init.pp b/modules/utilities/unix/firewall/firewall/manifests/init.pp similarity index 100% rename from modules/services/unix/firewall/firewall/manifests/init.pp rename to modules/utilities/unix/firewall/firewall/manifests/init.pp diff --git a/modules/services/unix/firewall/firewall/manifests/linux.pp b/modules/utilities/unix/firewall/firewall/manifests/linux.pp similarity index 100% rename from modules/services/unix/firewall/firewall/manifests/linux.pp rename to modules/utilities/unix/firewall/firewall/manifests/linux.pp diff --git a/modules/services/unix/firewall/firewall/manifests/linux/archlinux.pp b/modules/utilities/unix/firewall/firewall/manifests/linux/archlinux.pp similarity index 100% rename from modules/services/unix/firewall/firewall/manifests/linux/archlinux.pp rename to modules/utilities/unix/firewall/firewall/manifests/linux/archlinux.pp diff --git a/modules/services/unix/firewall/firewall/manifests/linux/debian.pp b/modules/utilities/unix/firewall/firewall/manifests/linux/debian.pp similarity index 100% rename from modules/services/unix/firewall/firewall/manifests/linux/debian.pp rename to modules/utilities/unix/firewall/firewall/manifests/linux/debian.pp diff --git a/modules/services/unix/firewall/firewall/manifests/linux/gentoo.pp b/modules/utilities/unix/firewall/firewall/manifests/linux/gentoo.pp similarity index 100% rename from modules/services/unix/firewall/firewall/manifests/linux/gentoo.pp rename to modules/utilities/unix/firewall/firewall/manifests/linux/gentoo.pp diff --git a/modules/services/unix/firewall/firewall/manifests/linux/redhat.pp b/modules/utilities/unix/firewall/firewall/manifests/linux/redhat.pp similarity index 100% rename from modules/services/unix/firewall/firewall/manifests/linux/redhat.pp rename to modules/utilities/unix/firewall/firewall/manifests/linux/redhat.pp diff --git a/modules/services/unix/firewall/firewall/manifests/params.pp b/modules/utilities/unix/firewall/firewall/manifests/params.pp similarity index 100% rename from modules/services/unix/firewall/firewall/manifests/params.pp rename to modules/utilities/unix/firewall/firewall/manifests/params.pp diff --git a/modules/services/unix/firewall/firewall/metadata.json b/modules/utilities/unix/firewall/firewall/metadata.json similarity index 100% rename from modules/services/unix/firewall/firewall/metadata.json rename to modules/utilities/unix/firewall/firewall/metadata.json diff --git a/modules/services/unix/firewall/firewall/secgen_metadata.xml b/modules/utilities/unix/firewall/firewall/secgen_metadata.xml similarity index 79% rename from modules/services/unix/firewall/firewall/secgen_metadata.xml rename to modules/utilities/unix/firewall/firewall/secgen_metadata.xml index 81cea1584..616e2f2e8 100644 --- a/modules/services/unix/firewall/firewall/secgen_metadata.xml +++ b/modules/utilities/unix/firewall/firewall/secgen_metadata.xml @@ -1,8 +1,8 @@ - + xsi:schemaLocation="http://www.github/cliffe/SecGen/utility"> Iptables firewall config Jason Keighley Puppet Labs, Inc. @@ -30,6 +30,4 @@ update - - - \ No newline at end of file + \ No newline at end of file diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/change_source_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/change_source_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/change_source_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/change_source_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/class_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/class_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/class_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/class_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/connlimit_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/connlimit_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/connlimit_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/connlimit_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/connmark_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/connmark_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/connmark_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/connmark_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/firewall_bridging_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_bridging_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/firewall_bridging_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_bridging_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/firewall_clusterip_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_clusterip_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/firewall_clusterip_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_clusterip_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/firewall_dscp_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_dscp_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/firewall_dscp_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_dscp_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/firewall_iptmodules_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_iptmodules_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/firewall_iptmodules_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_iptmodules_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/firewall_mss_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_mss_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/firewall_mss_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_mss_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/firewall_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/firewall_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/firewall_tee_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_tee_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/firewall_tee_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_tee_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/firewall_time_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_time_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/firewall_time_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_time_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/firewall_uid_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_uid_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/firewall_uid_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/firewall_uid_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/firewallchain_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/firewallchain_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/firewallchain_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/firewallchain_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/invert_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/invert_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/invert_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/invert_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/ip6_fragment_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/ip6_fragment_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/ip6_fragment_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/ip6_fragment_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/isfragment_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/isfragment_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/isfragment_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/isfragment_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/match_mark_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/match_mark_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/match_mark_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/match_mark_spec.rb diff --git a/modules/services/unix/utility/ntp/spec/acceptance/nodesets/centos-7-x64.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/centos-7-x64.yml similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/nodesets/centos-7-x64.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/centos-7-x64.yml diff --git a/modules/services/unix/utility/ntp/spec/acceptance/nodesets/debian-8-x64.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/debian-8-x64.yml similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/nodesets/debian-8-x64.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/debian-8-x64.yml diff --git a/modules/services/unix/utility/ntp/spec/acceptance/nodesets/default.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/default.yml similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/nodesets/default.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/default.yml diff --git a/modules/services/unix/utility/ntp/spec/acceptance/nodesets/docker/centos-7.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/docker/centos-7.yml similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/nodesets/docker/centos-7.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/docker/centos-7.yml diff --git a/modules/services/unix/utility/ntp/spec/acceptance/nodesets/docker/debian-8.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/docker/debian-8.yml similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/nodesets/docker/debian-8.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/docker/debian-8.yml diff --git a/modules/services/unix/utility/ntp/spec/acceptance/nodesets/docker/ubuntu-14.04.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/docker/ubuntu-14.04.yml similarity index 100% rename from modules/services/unix/utility/ntp/spec/acceptance/nodesets/docker/ubuntu-14.04.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/docker/ubuntu-14.04.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/debian-8-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/redhat-6-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/redhat-7-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/aio/ubuntu-1404-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-5-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-6-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/centos-7-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-7-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/debian-8-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/oracle-6-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/oracle-7-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-5-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-6-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/redhat-7-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-5-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-6-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/scientific-7-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-10-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-11-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/sles-12-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1004-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1204-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml b/modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml rename to modules/utilities/unix/firewall/firewall/spec/acceptance/nodesets/new/pe/ubuntu-1404-64mda.yml diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/params_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/params_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/params_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/params_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/purge_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/purge_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/purge_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/purge_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/resource_cmd_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/resource_cmd_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/resource_cmd_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/resource_cmd_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/rules_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/rules_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/rules_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/rules_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/socket_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/socket_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/socket_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/socket_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/acceptance/standard_usage_spec.rb b/modules/utilities/unix/firewall/firewall/spec/acceptance/standard_usage_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/acceptance/standard_usage_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/acceptance/standard_usage_spec.rb diff --git a/modules/services/unix/languages/java/spec/spec.opts b/modules/utilities/unix/firewall/firewall/spec/spec.opts similarity index 100% rename from modules/services/unix/languages/java/spec/spec.opts rename to modules/utilities/unix/firewall/firewall/spec/spec.opts diff --git a/modules/services/unix/firewall/firewall/spec/spec_helper.rb b/modules/utilities/unix/firewall/firewall/spec/spec_helper.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/spec_helper.rb rename to modules/utilities/unix/firewall/firewall/spec/spec_helper.rb diff --git a/modules/services/unix/firewall/firewall/spec/spec_helper_acceptance.rb b/modules/utilities/unix/firewall/firewall/spec/spec_helper_acceptance.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/spec_helper_acceptance.rb rename to modules/utilities/unix/firewall/firewall/spec/spec_helper_acceptance.rb diff --git a/modules/services/unix/firewall/firewall/spec/spec_helper_local.rb b/modules/utilities/unix/firewall/firewall/spec/spec_helper_local.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/spec_helper_local.rb rename to modules/utilities/unix/firewall/firewall/spec/spec_helper_local.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_linux_archlinux_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/classes/firewall_linux_debian_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_linux_debian_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/classes/firewall_linux_debian_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_linux_debian_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/classes/firewall_linux_gentoo_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_linux_gentoo_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/classes/firewall_linux_gentoo_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_linux_gentoo_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/classes/firewall_linux_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_linux_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/classes/firewall_linux_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_linux_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/classes/firewall_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/classes/firewall_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/classes/firewall_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/facter/iptables_persistent_version_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/facter/iptables_persistent_version_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/facter/iptables_persistent_version_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/facter/iptables_persistent_version_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/facter/iptables_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/facter/iptables_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/facter/iptables_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/facter/iptables_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/puppet/provider/ip6tables_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/puppet/provider/ip6tables_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/puppet/provider/ip6tables_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/puppet/provider/ip6tables_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/puppet/provider/iptables_chain_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/puppet/provider/iptables_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/puppet/provider/iptables_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/puppet/provider/iptables_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/puppet/provider/iptables_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/puppet/type/firewall_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/puppet/type/firewall_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/puppet/type/firewall_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/puppet/type/firewall_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/puppet/type/firewallchain_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/puppet/type/firewallchain_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/puppet/type/firewallchain_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/puppet/type/firewallchain_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/puppet/util/firewall_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/puppet/util/firewall_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/puppet/util/firewall_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/puppet/util/firewall_spec.rb diff --git a/modules/services/unix/firewall/firewall/spec/unit/puppet/util/ipcidr_spec.rb b/modules/utilities/unix/firewall/firewall/spec/unit/puppet/util/ipcidr_spec.rb similarity index 100% rename from modules/services/unix/firewall/firewall/spec/unit/puppet/util/ipcidr_spec.rb rename to modules/utilities/unix/firewall/firewall/spec/unit/puppet/util/ipcidr_spec.rb diff --git a/modules/services/unix/languages/java/CHANGELOG.md b/modules/utilities/unix/languages/java/CHANGELOG.md similarity index 100% rename from modules/services/unix/languages/java/CHANGELOG.md rename to modules/utilities/unix/languages/java/CHANGELOG.md diff --git a/modules/services/unix/utility/ntp/CONTRIBUTING.md b/modules/utilities/unix/languages/java/CONTRIBUTING.md similarity index 100% rename from modules/services/unix/utility/ntp/CONTRIBUTING.md rename to modules/utilities/unix/languages/java/CONTRIBUTING.md diff --git a/modules/services/unix/utility/ntp/Gemfile b/modules/utilities/unix/languages/java/Gemfile similarity index 100% rename from modules/services/unix/utility/ntp/Gemfile rename to modules/utilities/unix/languages/java/Gemfile diff --git a/modules/services/unix/utility/ntp/LICENSE b/modules/utilities/unix/languages/java/LICENSE similarity index 100% rename from modules/services/unix/utility/ntp/LICENSE rename to modules/utilities/unix/languages/java/LICENSE diff --git a/modules/services/unix/languages/java/NOTICE b/modules/utilities/unix/languages/java/NOTICE similarity index 100% rename from modules/services/unix/languages/java/NOTICE rename to modules/utilities/unix/languages/java/NOTICE diff --git a/modules/services/unix/languages/java/README.markdown b/modules/utilities/unix/languages/java/README.markdown similarity index 100% rename from modules/services/unix/languages/java/README.markdown rename to modules/utilities/unix/languages/java/README.markdown diff --git a/modules/services/unix/utility/ntp/Rakefile b/modules/utilities/unix/languages/java/Rakefile similarity index 100% rename from modules/services/unix/utility/ntp/Rakefile rename to modules/utilities/unix/languages/java/Rakefile diff --git a/modules/services/unix/languages/java/checksums.json b/modules/utilities/unix/languages/java/checksums.json similarity index 100% rename from modules/services/unix/languages/java/checksums.json rename to modules/utilities/unix/languages/java/checksums.json diff --git a/modules/services/unix/languages/java/java.pp b/modules/utilities/unix/languages/java/java.pp similarity index 100% rename from modules/services/unix/languages/java/java.pp rename to modules/utilities/unix/languages/java/java.pp diff --git a/modules/services/unix/languages/java/lib/facter/java_default_home.rb b/modules/utilities/unix/languages/java/lib/facter/java_default_home.rb similarity index 100% rename from modules/services/unix/languages/java/lib/facter/java_default_home.rb rename to modules/utilities/unix/languages/java/lib/facter/java_default_home.rb diff --git a/modules/services/unix/languages/java/lib/facter/java_libjvm_path.rb b/modules/utilities/unix/languages/java/lib/facter/java_libjvm_path.rb similarity index 100% rename from modules/services/unix/languages/java/lib/facter/java_libjvm_path.rb rename to modules/utilities/unix/languages/java/lib/facter/java_libjvm_path.rb diff --git a/modules/services/unix/languages/java/lib/facter/java_major_version.rb b/modules/utilities/unix/languages/java/lib/facter/java_major_version.rb similarity index 100% rename from modules/services/unix/languages/java/lib/facter/java_major_version.rb rename to modules/utilities/unix/languages/java/lib/facter/java_major_version.rb diff --git a/modules/services/unix/languages/java/lib/facter/java_patch_level.rb b/modules/utilities/unix/languages/java/lib/facter/java_patch_level.rb similarity index 100% rename from modules/services/unix/languages/java/lib/facter/java_patch_level.rb rename to modules/utilities/unix/languages/java/lib/facter/java_patch_level.rb diff --git a/modules/services/unix/languages/java/lib/facter/java_version.rb b/modules/utilities/unix/languages/java/lib/facter/java_version.rb similarity index 100% rename from modules/services/unix/languages/java/lib/facter/java_version.rb rename to modules/utilities/unix/languages/java/lib/facter/java_version.rb diff --git a/modules/services/unix/languages/java/manifests/config.pp b/modules/utilities/unix/languages/java/manifests/config.pp similarity index 100% rename from modules/services/unix/languages/java/manifests/config.pp rename to modules/utilities/unix/languages/java/manifests/config.pp diff --git a/modules/services/unix/languages/java/manifests/init.pp b/modules/utilities/unix/languages/java/manifests/init.pp similarity index 100% rename from modules/services/unix/languages/java/manifests/init.pp rename to modules/utilities/unix/languages/java/manifests/init.pp diff --git a/modules/services/unix/languages/java/manifests/oracle.pp b/modules/utilities/unix/languages/java/manifests/oracle.pp similarity index 100% rename from modules/services/unix/languages/java/manifests/oracle.pp rename to modules/utilities/unix/languages/java/manifests/oracle.pp diff --git a/modules/services/unix/languages/java/manifests/params.pp b/modules/utilities/unix/languages/java/manifests/params.pp similarity index 100% rename from modules/services/unix/languages/java/manifests/params.pp rename to modules/utilities/unix/languages/java/manifests/params.pp diff --git a/modules/services/unix/languages/java/metadata.json b/modules/utilities/unix/languages/java/metadata.json similarity index 100% rename from modules/services/unix/languages/java/metadata.json rename to modules/utilities/unix/languages/java/metadata.json diff --git a/modules/services/unix/languages/java/secgen_metadata.xml b/modules/utilities/unix/languages/java/secgen_metadata.xml similarity index 81% rename from modules/services/unix/languages/java/secgen_metadata.xml rename to modules/utilities/unix/languages/java/secgen_metadata.xml index 76f886f00..2f3a60218 100644 --- a/modules/services/unix/languages/java/secgen_metadata.xml +++ b/modules/utilities/unix/languages/java/secgen_metadata.xml @@ -1,8 +1,8 @@ - + xsi:schemaLocation="http://www.github/cliffe/SecGen/utility"> Java programming language Jason Keighley puppetlabs @@ -24,4 +24,4 @@ update - \ No newline at end of file + \ No newline at end of file diff --git a/modules/services/unix/languages/java/spec/acceptance/install_spec.rb b/modules/utilities/unix/languages/java/spec/acceptance/install_spec.rb similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/install_spec.rb rename to modules/utilities/unix/languages/java/spec/acceptance/install_spec.rb diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/centos-5-vcloud.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-5-vcloud.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/centos-5-vcloud.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-5-vcloud.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/centos-59-x64-pe.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-59-x64-pe.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/centos-59-x64-pe.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-59-x64-pe.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/centos-59-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-59-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/centos-59-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-59-x64.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/centos-6-vcloud.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-6-vcloud.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/centos-6-vcloud.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-6-vcloud.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/centos-64-x64-fusion.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-64-x64-fusion.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/centos-64-x64-fusion.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-64-x64-fusion.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/centos-64-x64-pe.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-64-x64-pe.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/centos-64-x64-pe.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-64-x64-pe.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/centos-64-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-64-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/centos-64-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-64-x64.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/centos-65-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-65-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/centos-65-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-65-x64.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/centos-7-vcloud.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-7-vcloud.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/centos-7-vcloud.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/centos-7-vcloud.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/debian-6-vcloud.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/debian-6-vcloud.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/debian-6-vcloud.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/debian-6-vcloud.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/debian-607-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/debian-607-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/debian-607-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/debian-607-x64.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/debian-7-vcloud.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/debian-7-vcloud.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/debian-7-vcloud.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/debian-7-vcloud.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/debian-70rc1-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/debian-70rc1-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/debian-70rc1-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/debian-70rc1-x64.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/default.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/default.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/default.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/default.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/fedora-18-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/fedora-18-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/fedora-18-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/fedora-18-x64.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/redhat-7-vcloud.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/redhat-7-vcloud.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/redhat-7-vcloud.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/redhat-7-vcloud.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/sles-11-vcloud.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/sles-11-vcloud.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/sles-11-vcloud.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/sles-11-vcloud.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/sles-11sp1-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/sles-11sp1-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/sles-11sp1-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/sles-11sp1-x64.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/solaris-11-vcloud.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/solaris-11-vcloud.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/solaris-11-vcloud.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/solaris-11-vcloud.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-1004-vcloud.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-1004-vcloud.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-1004-vcloud.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-1004-vcloud.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-1404-vcloud.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-1404-vcloud.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-1404-vcloud.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-1404-vcloud.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-10044-x64.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-12042-x64.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-1504-x64.yml b/modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-1504-x64.yml similarity index 100% rename from modules/services/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-1504-x64.yml rename to modules/utilities/unix/languages/java/spec/acceptance/nodesets/ubuntu-server-1504-x64.yml diff --git a/modules/services/unix/languages/java/spec/classes/java_spec.rb b/modules/utilities/unix/languages/java/spec/classes/java_spec.rb similarity index 100% rename from modules/services/unix/languages/java/spec/classes/java_spec.rb rename to modules/utilities/unix/languages/java/spec/classes/java_spec.rb diff --git a/modules/services/unix/languages/java/spec/defines/oracle_spec.rb b/modules/utilities/unix/languages/java/spec/defines/oracle_spec.rb similarity index 100% rename from modules/services/unix/languages/java/spec/defines/oracle_spec.rb rename to modules/utilities/unix/languages/java/spec/defines/oracle_spec.rb diff --git a/modules/services/unix/utility/ntp/spec/spec.opts b/modules/utilities/unix/languages/java/spec/spec.opts similarity index 100% rename from modules/services/unix/utility/ntp/spec/spec.opts rename to modules/utilities/unix/languages/java/spec/spec.opts diff --git a/modules/services/unix/utility/ntp/spec/spec_helper.rb b/modules/utilities/unix/languages/java/spec/spec_helper.rb similarity index 100% rename from modules/services/unix/utility/ntp/spec/spec_helper.rb rename to modules/utilities/unix/languages/java/spec/spec_helper.rb diff --git a/modules/services/unix/languages/java/spec/spec_helper_acceptance.rb b/modules/utilities/unix/languages/java/spec/spec_helper_acceptance.rb similarity index 100% rename from modules/services/unix/languages/java/spec/spec_helper_acceptance.rb rename to modules/utilities/unix/languages/java/spec/spec_helper_acceptance.rb diff --git a/modules/services/unix/languages/java/spec/unit/facter/java_default_home_spec.rb b/modules/utilities/unix/languages/java/spec/unit/facter/java_default_home_spec.rb similarity index 100% rename from modules/services/unix/languages/java/spec/unit/facter/java_default_home_spec.rb rename to modules/utilities/unix/languages/java/spec/unit/facter/java_default_home_spec.rb diff --git a/modules/services/unix/languages/java/spec/unit/facter/java_libjvm_path_spec.rb b/modules/utilities/unix/languages/java/spec/unit/facter/java_libjvm_path_spec.rb similarity index 100% rename from modules/services/unix/languages/java/spec/unit/facter/java_libjvm_path_spec.rb rename to modules/utilities/unix/languages/java/spec/unit/facter/java_libjvm_path_spec.rb diff --git a/modules/services/unix/languages/java/spec/unit/facter/java_major_version_spec.rb b/modules/utilities/unix/languages/java/spec/unit/facter/java_major_version_spec.rb similarity index 100% rename from modules/services/unix/languages/java/spec/unit/facter/java_major_version_spec.rb rename to modules/utilities/unix/languages/java/spec/unit/facter/java_major_version_spec.rb diff --git a/modules/services/unix/languages/java/spec/unit/facter/java_patch_level_spec.rb b/modules/utilities/unix/languages/java/spec/unit/facter/java_patch_level_spec.rb similarity index 100% rename from modules/services/unix/languages/java/spec/unit/facter/java_patch_level_spec.rb rename to modules/utilities/unix/languages/java/spec/unit/facter/java_patch_level_spec.rb diff --git a/modules/services/unix/languages/java/spec/unit/facter/java_version_spec.rb b/modules/utilities/unix/languages/java/spec/unit/facter/java_version_spec.rb similarity index 100% rename from modules/services/unix/languages/java/spec/unit/facter/java_version_spec.rb rename to modules/utilities/unix/languages/java/spec/unit/facter/java_version_spec.rb diff --git a/modules/services/unix/languages/java/tests/alternative.pp b/modules/utilities/unix/languages/java/tests/alternative.pp similarity index 100% rename from modules/services/unix/languages/java/tests/alternative.pp rename to modules/utilities/unix/languages/java/tests/alternative.pp diff --git a/modules/services/unix/languages/java/tests/init.pp b/modules/utilities/unix/languages/java/tests/init.pp similarity index 100% rename from modules/services/unix/languages/java/tests/init.pp rename to modules/utilities/unix/languages/java/tests/init.pp diff --git a/modules/services/unix/languages/java/tests/oracle.pp b/modules/utilities/unix/languages/java/tests/oracle.pp similarity index 100% rename from modules/services/unix/languages/java/tests/oracle.pp rename to modules/utilities/unix/languages/java/tests/oracle.pp diff --git a/modules/services/unix/update/unix_update/manifests/unix.pp b/modules/utilities/unix/update/unix_update/manifests/unix.pp similarity index 100% rename from modules/services/unix/update/unix_update/manifests/unix.pp rename to modules/utilities/unix/update/unix_update/manifests/unix.pp diff --git a/modules/services/unix/update/unix_update/secgen_metadata.xml b/modules/utilities/unix/update/unix_update/secgen_metadata.xml similarity index 75% rename from modules/services/unix/update/unix_update/secgen_metadata.xml rename to modules/utilities/unix/update/unix_update/secgen_metadata.xml index 0c9af2065..93a9c91f8 100644 --- a/modules/services/unix/update/unix_update/secgen_metadata.xml +++ b/modules/utilities/unix/update/unix_update/secgen_metadata.xml @@ -1,8 +1,8 @@ - + xsi:schemaLocation="http://www.github/cliffe/SecGen/utility"> Unix update repository Jason Keighley Apache v2 @@ -15,5 +15,4 @@ modules/[^/]*/windows/.* - - \ No newline at end of file + \ No newline at end of file diff --git a/modules/services/unix/update/unix_update/unix_update.pp b/modules/utilities/unix/update/unix_update/unix_update.pp similarity index 100% rename from modules/services/unix/update/unix_update/unix_update.pp rename to modules/utilities/unix/update/unix_update/unix_update.pp diff --git a/scenarios/simple_examples/clean_system_with_update_unix.xml b/scenarios/simple_examples/clean_system_with_update_unix.xml index d99084aeb..148cdc5a8 100644 --- a/scenarios/simple_examples/clean_system_with_update_unix.xml +++ b/scenarios/simple_examples/clean_system_with_update_unix.xml @@ -9,7 +9,7 @@ clean_system_with_update - + diff --git a/scenarios/simple_examples/firewall_configuration_example.xml b/scenarios/simple_examples/firewall_configuration_example.xml index cd458478d..634877628 100644 --- a/scenarios/simple_examples/firewall_configuration_example.xml +++ b/scenarios/simple_examples/firewall_configuration_example.xml @@ -9,7 +9,7 @@ firewall_configuration_example - + diff --git a/scenarios/simple_examples/java_service.xml b/scenarios/simple_examples/java_service.xml index 59d7df1ce..a6edd2cd6 100644 --- a/scenarios/simple_examples/java_service.xml +++ b/scenarios/simple_examples/java_service.xml @@ -9,7 +9,7 @@ system_with_java - + diff --git a/scenarios/simple_examples/ntp_service.xml b/scenarios/simple_examples/ntp_service.xml index 66522351c..275808ef3 100644 --- a/scenarios/simple_examples/ntp_service.xml +++ b/scenarios/simple_examples/ntp_service.xml @@ -9,7 +9,7 @@ ntp_server - + diff --git a/secgen.rb b/secgen.rb index d0cfeb0ae..eb1d95256 100644 --- a/secgen.rb +++ b/secgen.rb @@ -50,13 +50,17 @@ def build_config(scenario, out_dir) all_available_services = ModuleReader.read_services Print.std "#{all_available_services.size} service modules loaded" + Print.info 'Reading available utility modules...' + all_available_utilities = ModuleReader.read_utilities + Print.std "#{all_available_utilities.size} utility modules loaded" + Print.info 'Reading available network modules...' all_available_networks = ModuleReader.read_networks Print.std "#{all_available_networks.size} network modules loaded" Print.info 'Resolving systems: randomising scenario...' # for each system, select modules - all_available_modules = all_available_bases + all_available_vulnerabilties + all_available_services + all_available_networks + all_available_modules = all_available_bases + all_available_vulnerabilties + all_available_services + all_available_utilities + all_available_networks # update systems with module selections systems.map! {|system| system.module_selections = system.resolve_module_selection(all_available_modules)