Merge pull request #223 from myii/fix/ensure-map-data-directly-under-values

fix(_mapdata): ensure map data is directly under `values`

php/_mapdata/init.sls

@@ -6,9 +6,7 @@
 {%- from tplroot ~ "/map.jinja" import php with context %}
 
 {%- set _mapdata = {
-      "values": {
-        "php": php,
-      }
+      "values": php,
     } %}
 {%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %}
 

test/integration/default/files/_mapdata/amazonlinux-1.yaml

@@ -2,324 +2,323 @@
 # Amazon Linux AMI-2018
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings: {}
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings: {}
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings: {}
-      pools:
-        default.conf:
-          enabled: false
-          opts: {}
-      service:
-        enabled: true
+    pools:
+      default.conf:
+        enabled: false
         opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
-        enabled: true
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
-      defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      cli:
-        ini: /etc/php.ini
-      fpm:
-        conf: /etc/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php-fpm/error.log
-            pid: /var/run/php-fpm/php-fpm.pid
-          include: /etc/php-fpm.d/*.conf
-        group: root
-        ini: /etc/php.ini
-        pools: /etc/php-fpm.d
-        service: php-fpm
-        user: root
-      pkgs:
-        adodb: php-adodb
-        apc: php-pecl-apc
-        apcu: php-pecl-apcu
-        auth-sasl: php-pear-Auth-SASL
-        bcmath: php-bcmath
-        build_pkgs:
-        - openssl-devel
-        - gcc
-        cache-lite: php-pear-Cache-Lite
-        cgi: php-cgi
-        cli: php-cli
-        composer: composer
-        composer_bin: composer
-        console-table: php-pear-Console-Table
-        curl:
-        - php-common
-        - curl
-        dba:
-        - php-dba
-        - dba
-        dev: php-devel
-        ext_conf_path: /etc/php.d
-        fpm: php-fpm
-        gd: php-gd
-        geoip: php-pecl-geoip
-        geshi: php-geshi
-        gettext: php-php-gettext
-        http: php-pecl-http
-        imagick: php-pecl-imagick
-        imap: php-imap
-        intl: php-intl
-        json: php-common
-        ldap: php-ldap
-        local_bin: /usr/local/bin
-        mail: php-pear-Mail
-        mbstring: php-mbstring
-        mcrypt: php-mcrypt
-        memcache: php-pecl-memcache
-        memcached: php-pecl-memcached
-        mysql: php-mysql
-        mysqlnd: php-mysqlnd
-        net-smtp: php-pear-Net-SMTP
-        net4: php-pear-Net-IPv4
-        oauth: php-pecl-oauth
-        opcache: php-pecl-zendopcache
-        pear: php-pear
-        pgsql: php-pgsql
-        php: php
-        pspell: php-pspell
-        redis: php-pecl-redis
-        seclib: php-phpseclib
-        snmp: php-snmp
-        soap: php-soap
-        sqlite: php-pdo
-        ssh2: php-pecl-ssh2
-        suhosin5_ext: suhosin.so
-        suhosin5_repo: https://github.com/sektioneins/suhosin
-        suhosin7_ext: suhosin7.so
-        suhosin7_repo: https://github.com/sektioneins/suhosin7
-        tcpdf: php-tcpdf
-        temp_dir: /tmp
-        tidy: php-tidy
-        uuid: php-pecl-uuid
-        xcache: php-xcache
-        xdebug: php-pecl-xdebug
-        xml:
-        - php-xml
-        - php-xmlrpc
-        xsl: php-xml
-        zip: php
-      xcache:
-        ini: /etc/php.d/xcache.ini
-    xcache:
-      ini:
-        defaults:
-          xcache:
-            xcache.cacher: 'On'
-            xcache.coredump_directory: '""'
-            xcache.coredump_type: '0'
-            xcache.count: '1'
-            xcache.disable_on_crash: 'Off'
-            xcache.experimental: 'Off'
-            xcache.gc_interval: '0'
-            xcache.mmap_path: '"/dev/zero"'
-            xcache.optimizer: 'Off'
-            xcache.readonly_protection: 'Off'
-            xcache.shm_scheme: '"mmap"'
-            xcache.size: 60M
-            xcache.slots: 8K
-            xcache.stat: 'On'
-            xcache.ttl: '0'
-            xcache.var_count: '1'
-            xcache.var_gc_interval: '300'
-            xcache.var_maxttl: '0'
-            xcache.var_namespace: '""'
-            xcache.var_namespace_mode: '0'
-            xcache.var_size: 4M
-            xcache.var_slots: 8K
-            xcache.var_ttl: '0'
-          xcache-common:
-            extension: xcache.so
-          xcache.admin:
-            xcache.admin.enable_auth: 'On'
-          xcache.coverager:
-            xcache.coveragedump_directory: '""'
-            xcache.coverager: 'Off'
-            xcache.coverager_autostart: 'On'
+        settings: {}
+      server:
         opts: {}
         settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    cli:
+      ini: /etc/php.ini
+    fpm:
+      conf: /etc/php-fpm.conf
+      defaults:
+        global:
+          error_log: /var/log/php-fpm/error.log
+          pid: /var/run/php-fpm/php-fpm.pid
+        include: /etc/php-fpm.d/*.conf
+      group: root
+      ini: /etc/php.ini
+      pools: /etc/php-fpm.d
+      service: php-fpm
+      user: root
+    pkgs:
+      adodb: php-adodb
+      apc: php-pecl-apc
+      apcu: php-pecl-apcu
+      auth-sasl: php-pear-Auth-SASL
+      bcmath: php-bcmath
+      build_pkgs:
+      - openssl-devel
+      - gcc
+      cache-lite: php-pear-Cache-Lite
+      cgi: php-cgi
+      cli: php-cli
+      composer: composer
+      composer_bin: composer
+      console-table: php-pear-Console-Table
+      curl:
+      - php-common
+      - curl
+      dba:
+      - php-dba
+      - dba
+      dev: php-devel
+      ext_conf_path: /etc/php.d
+      fpm: php-fpm
+      gd: php-gd
+      geoip: php-pecl-geoip
+      geshi: php-geshi
+      gettext: php-php-gettext
+      http: php-pecl-http
+      imagick: php-pecl-imagick
+      imap: php-imap
+      intl: php-intl
+      json: php-common
+      ldap: php-ldap
+      local_bin: /usr/local/bin
+      mail: php-pear-Mail
+      mbstring: php-mbstring
+      mcrypt: php-mcrypt
+      memcache: php-pecl-memcache
+      memcached: php-pecl-memcached
+      mysql: php-mysql
+      mysqlnd: php-mysqlnd
+      net-smtp: php-pear-Net-SMTP
+      net4: php-pear-Net-IPv4
+      oauth: php-pecl-oauth
+      opcache: php-pecl-zendopcache
+      pear: php-pear
+      pgsql: php-pgsql
+      php: php
+      pspell: php-pspell
+      redis: php-pecl-redis
+      seclib: php-phpseclib
+      snmp: php-snmp
+      soap: php-soap
+      sqlite: php-pdo
+      ssh2: php-pecl-ssh2
+      suhosin5_ext: suhosin.so
+      suhosin5_repo: https://github.com/sektioneins/suhosin
+      suhosin7_ext: suhosin7.so
+      suhosin7_repo: https://github.com/sektioneins/suhosin7
+      tcpdf: php-tcpdf
+      temp_dir: /tmp
+      tidy: php-tidy
+      uuid: php-pecl-uuid
+      xcache: php-xcache
+      xdebug: php-pecl-xdebug
+      xml:
+      - php-xml
+      - php-xmlrpc
+      xsl: php-xml
+      zip: php
+    xcache:
+      ini: /etc/php.d/xcache.ini
+  xcache:
+    ini:
+      defaults:
+        xcache:
+          xcache.cacher: 'On'
+          xcache.coredump_directory: '""'
+          xcache.coredump_type: '0'
+          xcache.count: '1'
+          xcache.disable_on_crash: 'Off'
+          xcache.experimental: 'Off'
+          xcache.gc_interval: '0'
+          xcache.mmap_path: '"/dev/zero"'
+          xcache.optimizer: 'Off'
+          xcache.readonly_protection: 'Off'
+          xcache.shm_scheme: '"mmap"'
+          xcache.size: 60M
+          xcache.slots: 8K
+          xcache.stat: 'On'
+          xcache.ttl: '0'
+          xcache.var_count: '1'
+          xcache.var_gc_interval: '300'
+          xcache.var_maxttl: '0'
+          xcache.var_namespace: '""'
+          xcache.var_namespace_mode: '0'
+          xcache.var_size: 4M
+          xcache.var_slots: 8K
+          xcache.var_ttl: '0'
+        xcache-common:
+          extension: xcache.so
+        xcache.admin:
+          xcache.admin.enable_auth: 'On'
+        xcache.coverager:
+          xcache.coveragedump_directory: '""'
+          xcache.coverager: 'Off'
+          xcache.coverager_autostart: 'On'
+      opts: {}
+      settings: {}

test/integration/default/files/_mapdata/amazonlinux-2.yaml

@@ -2,324 +2,323 @@
 # Amazon Linux-2
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings: {}
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings: {}
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings: {}
-      pools:
-        default.conf:
-          enabled: false
-          opts: {}
-      service:
-        enabled: true
+    pools:
+      default.conf:
+        enabled: false
         opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
-        enabled: true
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
-      defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      cli:
-        ini: /etc/php.ini
-      fpm:
-        conf: /etc/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php-fpm/error.log
-            pid: /var/run/php-fpm/php-fpm.pid
-          include: /etc/php-fpm.d/*.conf
-        group: root
-        ini: /etc/php.ini
-        pools: /etc/php-fpm.d
-        service: php-fpm
-        user: root
-      pkgs:
-        adodb: php-adodb
-        apc: php-pecl-apc
-        apcu: php-pecl-apcu
-        auth-sasl: php-pear-Auth-SASL
-        bcmath: php-bcmath
-        build_pkgs:
-        - openssl-devel
-        - gcc
-        cache-lite: php-pear-Cache-Lite
-        cgi: php-cgi
-        cli: php-cli
-        composer: composer
-        composer_bin: composer
-        console-table: php-pear-Console-Table
-        curl:
-        - php-common
-        - curl
-        dba:
-        - php-dba
-        - dba
-        dev: php-devel
-        ext_conf_path: /etc/php.d
-        fpm: php-fpm
-        gd: php-gd
-        geoip: php-pecl-geoip
-        geshi: php-geshi
-        gettext: php-php-gettext
-        http: php-pecl-http
-        imagick: php-pecl-imagick
-        imap: php-imap
-        intl: php-intl
-        json: php-common
-        ldap: php-ldap
-        local_bin: /usr/local/bin
-        mail: php-pear-Mail
-        mbstring: php-mbstring
-        mcrypt: php-mcrypt
-        memcache: php-pecl-memcache
-        memcached: php-pecl-memcached
-        mysql: php-mysql
-        mysqlnd: php-mysqlnd
-        net-smtp: php-pear-Net-SMTP
-        net4: php-pear-Net-IPv4
-        oauth: php-pecl-oauth
-        opcache: php-pecl-zendopcache
-        pear: php-pear
-        pgsql: php-pgsql
-        php: php
-        pspell: php-pspell
-        redis: php-pecl-redis
-        seclib: php-phpseclib
-        snmp: php-snmp
-        soap: php-soap
-        sqlite: php-pdo
-        ssh2: php-pecl-ssh2
-        suhosin5_ext: suhosin.so
-        suhosin5_repo: https://github.com/sektioneins/suhosin
-        suhosin7_ext: suhosin7.so
-        suhosin7_repo: https://github.com/sektioneins/suhosin7
-        tcpdf: php-tcpdf
-        temp_dir: /tmp
-        tidy: php-tidy
-        uuid: php-pecl-uuid
-        xcache: php-xcache
-        xdebug: php-pecl-xdebug
-        xml:
-        - php-xml
-        - php-xmlrpc
-        xsl: php-xml
-        zip: php
-      xcache:
-        ini: /etc/php.d/xcache.ini
-    xcache:
-      ini:
-        defaults:
-          xcache:
-            xcache.cacher: 'On'
-            xcache.coredump_directory: '""'
-            xcache.coredump_type: '0'
-            xcache.count: '1'
-            xcache.disable_on_crash: 'Off'
-            xcache.experimental: 'Off'
-            xcache.gc_interval: '0'
-            xcache.mmap_path: '"/dev/zero"'
-            xcache.optimizer: 'Off'
-            xcache.readonly_protection: 'Off'
-            xcache.shm_scheme: '"mmap"'
-            xcache.size: 60M
-            xcache.slots: 8K
-            xcache.stat: 'On'
-            xcache.ttl: '0'
-            xcache.var_count: '1'
-            xcache.var_gc_interval: '300'
-            xcache.var_maxttl: '0'
-            xcache.var_namespace: '""'
-            xcache.var_namespace_mode: '0'
-            xcache.var_size: 4M
-            xcache.var_slots: 8K
-            xcache.var_ttl: '0'
-          xcache-common:
-            extension: xcache.so
-          xcache.admin:
-            xcache.admin.enable_auth: 'On'
-          xcache.coverager:
-            xcache.coveragedump_directory: '""'
-            xcache.coverager: 'Off'
-            xcache.coverager_autostart: 'On'
+        settings: {}
+      server:
         opts: {}
         settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    cli:
+      ini: /etc/php.ini
+    fpm:
+      conf: /etc/php-fpm.conf
+      defaults:
+        global:
+          error_log: /var/log/php-fpm/error.log
+          pid: /var/run/php-fpm/php-fpm.pid
+        include: /etc/php-fpm.d/*.conf
+      group: root
+      ini: /etc/php.ini
+      pools: /etc/php-fpm.d
+      service: php-fpm
+      user: root
+    pkgs:
+      adodb: php-adodb
+      apc: php-pecl-apc
+      apcu: php-pecl-apcu
+      auth-sasl: php-pear-Auth-SASL
+      bcmath: php-bcmath
+      build_pkgs:
+      - openssl-devel
+      - gcc
+      cache-lite: php-pear-Cache-Lite
+      cgi: php-cgi
+      cli: php-cli
+      composer: composer
+      composer_bin: composer
+      console-table: php-pear-Console-Table
+      curl:
+      - php-common
+      - curl
+      dba:
+      - php-dba
+      - dba
+      dev: php-devel
+      ext_conf_path: /etc/php.d
+      fpm: php-fpm
+      gd: php-gd
+      geoip: php-pecl-geoip
+      geshi: php-geshi
+      gettext: php-php-gettext
+      http: php-pecl-http
+      imagick: php-pecl-imagick
+      imap: php-imap
+      intl: php-intl
+      json: php-common
+      ldap: php-ldap
+      local_bin: /usr/local/bin
+      mail: php-pear-Mail
+      mbstring: php-mbstring
+      mcrypt: php-mcrypt
+      memcache: php-pecl-memcache
+      memcached: php-pecl-memcached
+      mysql: php-mysql
+      mysqlnd: php-mysqlnd
+      net-smtp: php-pear-Net-SMTP
+      net4: php-pear-Net-IPv4
+      oauth: php-pecl-oauth
+      opcache: php-pecl-zendopcache
+      pear: php-pear
+      pgsql: php-pgsql
+      php: php
+      pspell: php-pspell
+      redis: php-pecl-redis
+      seclib: php-phpseclib
+      snmp: php-snmp
+      soap: php-soap
+      sqlite: php-pdo
+      ssh2: php-pecl-ssh2
+      suhosin5_ext: suhosin.so
+      suhosin5_repo: https://github.com/sektioneins/suhosin
+      suhosin7_ext: suhosin7.so
+      suhosin7_repo: https://github.com/sektioneins/suhosin7
+      tcpdf: php-tcpdf
+      temp_dir: /tmp
+      tidy: php-tidy
+      uuid: php-pecl-uuid
+      xcache: php-xcache
+      xdebug: php-pecl-xdebug
+      xml:
+      - php-xml
+      - php-xmlrpc
+      xsl: php-xml
+      zip: php
+    xcache:
+      ini: /etc/php.d/xcache.ini
+  xcache:
+    ini:
+      defaults:
+        xcache:
+          xcache.cacher: 'On'
+          xcache.coredump_directory: '""'
+          xcache.coredump_type: '0'
+          xcache.count: '1'
+          xcache.disable_on_crash: 'Off'
+          xcache.experimental: 'Off'
+          xcache.gc_interval: '0'
+          xcache.mmap_path: '"/dev/zero"'
+          xcache.optimizer: 'Off'
+          xcache.readonly_protection: 'Off'
+          xcache.shm_scheme: '"mmap"'
+          xcache.size: 60M
+          xcache.slots: 8K
+          xcache.stat: 'On'
+          xcache.ttl: '0'
+          xcache.var_count: '1'
+          xcache.var_gc_interval: '300'
+          xcache.var_maxttl: '0'
+          xcache.var_namespace: '""'
+          xcache.var_namespace_mode: '0'
+          xcache.var_size: 4M
+          xcache.var_slots: 8K
+          xcache.var_ttl: '0'
+        xcache-common:
+          extension: xcache.so
+        xcache.admin:
+          xcache.admin.enable_auth: 'On'
+        xcache.coverager:
+          xcache.coveragedump_directory: '""'
+          xcache.coverager: 'Off'
+          xcache.coverager_autostart: 'On'
+      opts: {}
+      settings: {}

test/integration/default/files/_mapdata/centos-7.yaml

@@ -2,324 +2,323 @@
 # CentOS Linux-7
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings: {}
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings: {}
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings: {}
-      pools:
-        default.conf:
-          enabled: false
-          opts: {}
-      service:
-        enabled: true
+    pools:
+      default.conf:
+        enabled: false
         opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
-        enabled: true
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
-      defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      cli:
-        ini: /etc/php.ini
-      fpm:
-        conf: /etc/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php-fpm/error.log
-            pid: /var/run/php-fpm/php-fpm.pid
-          include: /etc/php-fpm.d/*.conf
-        group: root
-        ini: /etc/php.ini
-        pools: /etc/php-fpm.d
-        service: php-fpm
-        user: root
-      pkgs:
-        adodb: php-adodb
-        apc: php-pecl-apc
-        apcu: php-pecl-apcu
-        auth-sasl: php-pear-Auth-SASL
-        bcmath: php-bcmath
-        build_pkgs:
-        - openssl-devel
-        - gcc
-        cache-lite: php-pear-Cache-Lite
-        cgi: php-cgi
-        cli: php-cli
-        composer: composer
-        composer_bin: composer
-        console-table: php-pear-Console-Table
-        curl:
-        - php-common
-        - curl
-        dba:
-        - php-dba
-        - dba
-        dev: php-devel
-        ext_conf_path: /etc/php.d
-        fpm: php-fpm
-        gd: php-gd
-        geoip: php-pecl-geoip
-        geshi: php-geshi
-        gettext: php-php-gettext
-        http: php-pecl-http
-        imagick: php-pecl-imagick
-        imap: php-imap
-        intl: php-intl
-        json: php-common
-        ldap: php-ldap
-        local_bin: /usr/local/bin
-        mail: php-pear-Mail
-        mbstring: php-mbstring
-        mcrypt: php-mcrypt
-        memcache: php-pecl-memcache
-        memcached: php-pecl-memcached
-        mysql: php-mysql
-        mysqlnd: php-mysqlnd
-        net-smtp: php-pear-Net-SMTP
-        net4: php-pear-Net-IPv4
-        oauth: php-pecl-oauth
-        opcache: php-pecl-zendopcache
-        pear: php-pear
-        pgsql: php-pgsql
-        php: php
-        pspell: php-pspell
-        redis: php-pecl-redis
-        seclib: php-phpseclib
-        snmp: php-snmp
-        soap: php-soap
-        sqlite: php-pdo
-        ssh2: php-pecl-ssh2
-        suhosin5_ext: suhosin.so
-        suhosin5_repo: https://github.com/sektioneins/suhosin
-        suhosin7_ext: suhosin7.so
-        suhosin7_repo: https://github.com/sektioneins/suhosin7
-        tcpdf: php-tcpdf
-        temp_dir: /tmp
-        tidy: php-tidy
-        uuid: php-pecl-uuid
-        xcache: php-xcache
-        xdebug: php-pecl-xdebug
-        xml:
-        - php-xml
-        - php-xmlrpc
-        xsl: php-xml
-        zip: php
-      xcache:
-        ini: /etc/php.d/xcache.ini
-    xcache:
-      ini:
-        defaults:
-          xcache:
-            xcache.cacher: 'On'
-            xcache.coredump_directory: '""'
-            xcache.coredump_type: '0'
-            xcache.count: '1'
-            xcache.disable_on_crash: 'Off'
-            xcache.experimental: 'Off'
-            xcache.gc_interval: '0'
-            xcache.mmap_path: '"/dev/zero"'
-            xcache.optimizer: 'Off'
-            xcache.readonly_protection: 'Off'
-            xcache.shm_scheme: '"mmap"'
-            xcache.size: 60M
-            xcache.slots: 8K
-            xcache.stat: 'On'
-            xcache.ttl: '0'
-            xcache.var_count: '1'
-            xcache.var_gc_interval: '300'
-            xcache.var_maxttl: '0'
-            xcache.var_namespace: '""'
-            xcache.var_namespace_mode: '0'
-            xcache.var_size: 4M
-            xcache.var_slots: 8K
-            xcache.var_ttl: '0'
-          xcache-common:
-            extension: xcache.so
-          xcache.admin:
-            xcache.admin.enable_auth: 'On'
-          xcache.coverager:
-            xcache.coveragedump_directory: '""'
-            xcache.coverager: 'Off'
-            xcache.coverager_autostart: 'On'
+        settings: {}
+      server:
         opts: {}
         settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    cli:
+      ini: /etc/php.ini
+    fpm:
+      conf: /etc/php-fpm.conf
+      defaults:
+        global:
+          error_log: /var/log/php-fpm/error.log
+          pid: /var/run/php-fpm/php-fpm.pid
+        include: /etc/php-fpm.d/*.conf
+      group: root
+      ini: /etc/php.ini
+      pools: /etc/php-fpm.d
+      service: php-fpm
+      user: root
+    pkgs:
+      adodb: php-adodb
+      apc: php-pecl-apc
+      apcu: php-pecl-apcu
+      auth-sasl: php-pear-Auth-SASL
+      bcmath: php-bcmath
+      build_pkgs:
+      - openssl-devel
+      - gcc
+      cache-lite: php-pear-Cache-Lite
+      cgi: php-cgi
+      cli: php-cli
+      composer: composer
+      composer_bin: composer
+      console-table: php-pear-Console-Table
+      curl:
+      - php-common
+      - curl
+      dba:
+      - php-dba
+      - dba
+      dev: php-devel
+      ext_conf_path: /etc/php.d
+      fpm: php-fpm
+      gd: php-gd
+      geoip: php-pecl-geoip
+      geshi: php-geshi
+      gettext: php-php-gettext
+      http: php-pecl-http
+      imagick: php-pecl-imagick
+      imap: php-imap
+      intl: php-intl
+      json: php-common
+      ldap: php-ldap
+      local_bin: /usr/local/bin
+      mail: php-pear-Mail
+      mbstring: php-mbstring
+      mcrypt: php-mcrypt
+      memcache: php-pecl-memcache
+      memcached: php-pecl-memcached
+      mysql: php-mysql
+      mysqlnd: php-mysqlnd
+      net-smtp: php-pear-Net-SMTP
+      net4: php-pear-Net-IPv4
+      oauth: php-pecl-oauth
+      opcache: php-pecl-zendopcache
+      pear: php-pear
+      pgsql: php-pgsql
+      php: php
+      pspell: php-pspell
+      redis: php-pecl-redis
+      seclib: php-phpseclib
+      snmp: php-snmp
+      soap: php-soap
+      sqlite: php-pdo
+      ssh2: php-pecl-ssh2
+      suhosin5_ext: suhosin.so
+      suhosin5_repo: https://github.com/sektioneins/suhosin
+      suhosin7_ext: suhosin7.so
+      suhosin7_repo: https://github.com/sektioneins/suhosin7
+      tcpdf: php-tcpdf
+      temp_dir: /tmp
+      tidy: php-tidy
+      uuid: php-pecl-uuid
+      xcache: php-xcache
+      xdebug: php-pecl-xdebug
+      xml:
+      - php-xml
+      - php-xmlrpc
+      xsl: php-xml
+      zip: php
+    xcache:
+      ini: /etc/php.d/xcache.ini
+  xcache:
+    ini:
+      defaults:
+        xcache:
+          xcache.cacher: 'On'
+          xcache.coredump_directory: '""'
+          xcache.coredump_type: '0'
+          xcache.count: '1'
+          xcache.disable_on_crash: 'Off'
+          xcache.experimental: 'Off'
+          xcache.gc_interval: '0'
+          xcache.mmap_path: '"/dev/zero"'
+          xcache.optimizer: 'Off'
+          xcache.readonly_protection: 'Off'
+          xcache.shm_scheme: '"mmap"'
+          xcache.size: 60M
+          xcache.slots: 8K
+          xcache.stat: 'On'
+          xcache.ttl: '0'
+          xcache.var_count: '1'
+          xcache.var_gc_interval: '300'
+          xcache.var_maxttl: '0'
+          xcache.var_namespace: '""'
+          xcache.var_namespace_mode: '0'
+          xcache.var_size: 4M
+          xcache.var_slots: 8K
+          xcache.var_ttl: '0'
+        xcache-common:
+          extension: xcache.so
+        xcache.admin:
+          xcache.admin.enable_auth: 'On'
+        xcache.coverager:
+          xcache.coveragedump_directory: '""'
+          xcache.coverager: 'Off'
+          xcache.coverager_autostart: 'On'
+      opts: {}
+      settings: {}

test/integration/default/files/_mapdata/centos-8.yaml

@@ -2,324 +2,323 @@
 # CentOS Linux-8
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings: {}
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings: {}
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings: {}
-      pools:
-        default.conf:
-          enabled: false
-          opts: {}
-      service:
-        enabled: true
+    pools:
+      default.conf:
+        enabled: false
         opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
-        enabled: true
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
-      defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      cli:
-        ini: /etc/php.ini
-      fpm:
-        conf: /etc/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php-fpm/error.log
-            pid: /var/run/php-fpm/php-fpm.pid
-          include: /etc/php-fpm.d/*.conf
-        group: root
-        ini: /etc/php.ini
-        pools: /etc/php-fpm.d
-        service: php-fpm
-        user: root
-      pkgs:
-        adodb: php-adodb
-        apc: php-pecl-apc
-        apcu: php-pecl-apcu
-        auth-sasl: php-pear-Auth-SASL
-        bcmath: php-bcmath
-        build_pkgs:
-        - openssl-devel
-        - gcc
-        cache-lite: php-pear-Cache-Lite
-        cgi: php-cgi
-        cli: php-cli
-        composer: composer
-        composer_bin: composer
-        console-table: php-pear-Console-Table
-        curl:
-        - php-common
-        - curl
-        dba:
-        - php-dba
-        - dba
-        dev: php-devel
-        ext_conf_path: /etc/php.d
-        fpm: php-fpm
-        gd: php-gd
-        geoip: php-pecl-geoip
-        geshi: php-geshi
-        gettext: php-php-gettext
-        http: php-pecl-http
-        imagick: php-pecl-imagick
-        imap: php-imap
-        intl: php-intl
-        json: php-common
-        ldap: php-ldap
-        local_bin: /usr/local/bin
-        mail: php-pear-Mail
-        mbstring: php-mbstring
-        mcrypt: php-mcrypt
-        memcache: php-pecl-memcache
-        memcached: php-pecl-memcached
-        mysql: php-mysql
-        mysqlnd: php-mysqlnd
-        net-smtp: php-pear-Net-SMTP
-        net4: php-pear-Net-IPv4
-        oauth: php-pecl-oauth
-        opcache: php-pecl-zendopcache
-        pear: php-pear
-        pgsql: php-pgsql
-        php: php
-        pspell: php-pspell
-        redis: php-pecl-redis
-        seclib: php-phpseclib
-        snmp: php-snmp
-        soap: php-soap
-        sqlite: php-pdo
-        ssh2: php-pecl-ssh2
-        suhosin5_ext: suhosin.so
-        suhosin5_repo: https://github.com/sektioneins/suhosin
-        suhosin7_ext: suhosin7.so
-        suhosin7_repo: https://github.com/sektioneins/suhosin7
-        tcpdf: php-tcpdf
-        temp_dir: /tmp
-        tidy: php-tidy
-        uuid: php-pecl-uuid
-        xcache: php-xcache
-        xdebug: php-pecl-xdebug
-        xml:
-        - php-xml
-        - php-xmlrpc
-        xsl: php-xml
-        zip: php
-      xcache:
-        ini: /etc/php.d/xcache.ini
-    xcache:
-      ini:
-        defaults:
-          xcache:
-            xcache.cacher: 'On'
-            xcache.coredump_directory: '""'
-            xcache.coredump_type: '0'
-            xcache.count: '1'
-            xcache.disable_on_crash: 'Off'
-            xcache.experimental: 'Off'
-            xcache.gc_interval: '0'
-            xcache.mmap_path: '"/dev/zero"'
-            xcache.optimizer: 'Off'
-            xcache.readonly_protection: 'Off'
-            xcache.shm_scheme: '"mmap"'
-            xcache.size: 60M
-            xcache.slots: 8K
-            xcache.stat: 'On'
-            xcache.ttl: '0'
-            xcache.var_count: '1'
-            xcache.var_gc_interval: '300'
-            xcache.var_maxttl: '0'
-            xcache.var_namespace: '""'
-            xcache.var_namespace_mode: '0'
-            xcache.var_size: 4M
-            xcache.var_slots: 8K
-            xcache.var_ttl: '0'
-          xcache-common:
-            extension: xcache.so
-          xcache.admin:
-            xcache.admin.enable_auth: 'On'
-          xcache.coverager:
-            xcache.coveragedump_directory: '""'
-            xcache.coverager: 'Off'
-            xcache.coverager_autostart: 'On'
+        settings: {}
+      server:
         opts: {}
         settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    cli:
+      ini: /etc/php.ini
+    fpm:
+      conf: /etc/php-fpm.conf
+      defaults:
+        global:
+          error_log: /var/log/php-fpm/error.log
+          pid: /var/run/php-fpm/php-fpm.pid
+        include: /etc/php-fpm.d/*.conf
+      group: root
+      ini: /etc/php.ini
+      pools: /etc/php-fpm.d
+      service: php-fpm
+      user: root
+    pkgs:
+      adodb: php-adodb
+      apc: php-pecl-apc
+      apcu: php-pecl-apcu
+      auth-sasl: php-pear-Auth-SASL
+      bcmath: php-bcmath
+      build_pkgs:
+      - openssl-devel
+      - gcc
+      cache-lite: php-pear-Cache-Lite
+      cgi: php-cgi
+      cli: php-cli
+      composer: composer
+      composer_bin: composer
+      console-table: php-pear-Console-Table
+      curl:
+      - php-common
+      - curl
+      dba:
+      - php-dba
+      - dba
+      dev: php-devel
+      ext_conf_path: /etc/php.d
+      fpm: php-fpm
+      gd: php-gd
+      geoip: php-pecl-geoip
+      geshi: php-geshi
+      gettext: php-php-gettext
+      http: php-pecl-http
+      imagick: php-pecl-imagick
+      imap: php-imap
+      intl: php-intl
+      json: php-common
+      ldap: php-ldap
+      local_bin: /usr/local/bin
+      mail: php-pear-Mail
+      mbstring: php-mbstring
+      mcrypt: php-mcrypt
+      memcache: php-pecl-memcache
+      memcached: php-pecl-memcached
+      mysql: php-mysql
+      mysqlnd: php-mysqlnd
+      net-smtp: php-pear-Net-SMTP
+      net4: php-pear-Net-IPv4
+      oauth: php-pecl-oauth
+      opcache: php-pecl-zendopcache
+      pear: php-pear
+      pgsql: php-pgsql
+      php: php
+      pspell: php-pspell
+      redis: php-pecl-redis
+      seclib: php-phpseclib
+      snmp: php-snmp
+      soap: php-soap
+      sqlite: php-pdo
+      ssh2: php-pecl-ssh2
+      suhosin5_ext: suhosin.so
+      suhosin5_repo: https://github.com/sektioneins/suhosin
+      suhosin7_ext: suhosin7.so
+      suhosin7_repo: https://github.com/sektioneins/suhosin7
+      tcpdf: php-tcpdf
+      temp_dir: /tmp
+      tidy: php-tidy
+      uuid: php-pecl-uuid
+      xcache: php-xcache
+      xdebug: php-pecl-xdebug
+      xml:
+      - php-xml
+      - php-xmlrpc
+      xsl: php-xml
+      zip: php
+    xcache:
+      ini: /etc/php.d/xcache.ini
+  xcache:
+    ini:
+      defaults:
+        xcache:
+          xcache.cacher: 'On'
+          xcache.coredump_directory: '""'
+          xcache.coredump_type: '0'
+          xcache.count: '1'
+          xcache.disable_on_crash: 'Off'
+          xcache.experimental: 'Off'
+          xcache.gc_interval: '0'
+          xcache.mmap_path: '"/dev/zero"'
+          xcache.optimizer: 'Off'
+          xcache.readonly_protection: 'Off'
+          xcache.shm_scheme: '"mmap"'
+          xcache.size: 60M
+          xcache.slots: 8K
+          xcache.stat: 'On'
+          xcache.ttl: '0'
+          xcache.var_count: '1'
+          xcache.var_gc_interval: '300'
+          xcache.var_maxttl: '0'
+          xcache.var_namespace: '""'
+          xcache.var_namespace_mode: '0'
+          xcache.var_size: 4M
+          xcache.var_slots: 8K
+          xcache.var_ttl: '0'
+        xcache-common:
+          extension: xcache.so
+        xcache.admin:
+          xcache.admin.enable_auth: 'On'
+        xcache.coverager:
+          xcache.coveragedump_directory: '""'
+          xcache.coverager: 'Off'
+          xcache.coverager_autostart: 'On'
+      opts: {}
+      settings: {}

test/integration/default/files/_mapdata/debian-10.yaml

@@ -2,12 +2,25 @@
 # Debian-10
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings:
+        Assertion:
+          zend.assertions: -1
+        Date:
+          date.timezone: Europe/Paris
+        PHP:
+          default_charset: UTF-8
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings:
@@ -16,377 +29,363 @@ values:
           Date:
             date.timezone: Europe/Paris
           PHP:
+            cgi.fix_pathinfo: 0
             default_charset: UTF-8
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings:
-            Assertion:
-              zend.assertions: -1
-            Date:
-              date.timezone: Europe/Paris
-            PHP:
-              cgi.fix_pathinfo: 0
-              default_charset: UTF-8
-              expose_php: 'Off'
-      pools:
-        ldap-admin.conf:
-          enabled: true
-          phpversion: '7.3'
-          settings:
-            ldap-admin:
-              catch_workers_output: 'yes'
-              group: www-data
-              listen: /tmp/php-fpm-ldap-admin2.sock
-              listen.mode: '0666'
-              php_admin_value[date.timezone]: Europe/Paris
-              ping.path: /php-ping
-              pm: static
-              pm.max_children: 3
-              pm.max_requests: 500
-              pm.status_path: /php-status
-              security.limit_extensions: .php
-              user: www-data
-        radius-admin.conf:
-          enabled: true
-          phpversion: '5.6'
-          settings:
-            radius-admin:
-              catch_workers_output: 'yes'
-              group: www-data
-              listen: /tmp/php-fpm-radius-admin.sock
-              listen.mode: '0666'
-              php_admin_value[date.timezone]: Europe/Paris
-              ping.path: /php-ping
-              pm: static
-              pm.max_children: 3
-              pm.max_requests: 500
-              pm.status_path: /php-status
-              security.limit_extensions: .php
-              user: www-data
-      service:
+            expose_php: 'Off'
+    pools:
+      ldap-admin.conf:
         enabled: true
-        opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
+        phpversion: '7.3'
+        settings:
+          ldap-admin:
+            catch_workers_output: 'yes'
+            group: www-data
+            listen: /tmp/php-fpm-ldap-admin2.sock
+            listen.mode: '0666'
+            php_admin_value[date.timezone]: Europe/Paris
+            ping.path: /php-ping
+            pm: static
+            pm.max_children: 3
+            pm.max_requests: 500
+            pm.status_path: /php-status
+            security.limit_extensions: .php
+            user: www-data
+      radius-admin.conf:
         enabled: true
+        phpversion: '5.6'
+        settings:
+          radius-admin:
+            catch_workers_output: 'yes'
+            group: www-data
+            listen: /tmp/php-fpm-radius-admin.sock
+            listen.mode: '0666'
+            php_admin_value[date.timezone]: Europe/Paris
+            ping.path: /php-ping
+            pm: static
+            pm.max_children: 3
+            pm.max_requests: 500
+            pm.status_path: /php-status
+            security.limit_extensions: .php
+            user: www-data
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
+        settings: {}
+      server:
+        opts: {}
+        settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    apache2:
+      ini: /etc/php/5.6/apache2/php.ini
+    cli:
+      ini: /etc/php/5.6/cli/php.ini
+    fpm:
+      conf: /etc/php/5.6/fpm/php-fpm.conf
       defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      apache2:
-        ini: /etc/php/5.6/apache2/php.ini
-      cli:
-        ini: /etc/php/5.6/cli/php.ini
-      fpm:
-        conf: /etc/php/5.6/fpm/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php5.6-fpm.log
-            pid: /var/run/php5.6-fpm.pid
-          include: /etc/php/5.6/fpm/pool.d/*.conf
-        group: root
-        ini: /etc/php/5.6/fpm/php.ini
-        pools: /etc/php/5.6/fpm/pool.d
-        service: php5.6-fpm
-        user: root
-      hhvm:
-        conf: /etc/hhvm/server.ini
-        defaults: {}
-        ini: /etc/hhvm/php.ini
-        php:
-          hhvm.log.always_log_unhandled_exceptions: 'true'
-          hhvm.log.level: Warning
-          hhvm.log.runtime_error_reporting_level: '8191'
-          hhvm.mysql.typed_results: 'false'
-          session.gc_maxlifetime: '1440'
-          session.save_handler: files
-          session.save_path: /var/lib/hhvm/sessions
-        server:
-          hhvm.log.file: /var/log/hhvm/error.log
-          hhvm.log.use_log_file: 'true'
-          hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-          hhvm.server.default_document: index.php
-          hhvm.server.port: '9000'
-          hhvm.server.type: fastcgi
-          pid: /var/run/hhvm/pid
-        service: hhvm
-      pkgs:
-        adodb: libphp-adodb
-        apache2: libapache2-mod-php5.6
-        apc: php-apcu
-        apcu: php-apcu-bc
-        auth-sasl: php-auth-sasl
-        bcmath: php5.6-bcmath
-        build_pkgs:
-        - libssl-dev
-        - libcurl4-openssl-dev
-        - pkg-config
-        - libsslcommon2-dev
-        - gcc
-        - make
-        - autoconf
-        - libc-dev
-        - pkg-config
-        bz2: php5.6-bz2
-        cache-lite: php-cache-lite
-        cgi: php5.6-cgi
-        cli: php5.6-cli
-        composer_bin: composer
-        console-table: php-console-table
-        curl: php5.6-curl
-        dba: php5.6-dba
-        dev: php5.6-dev
-        ext_conf_path: /etc/php/5.6/mods-available
-        fpm: php5.6-fpm
-        gd: php5.6-gd
-        gearman: php-gearman
-        geoip: php-geoip
-        geshi: php-geshi
-        gettext: php5.6
-        gmp: php5.6-gmp
-        hhvm: hhvm
-        igbinary: php-igbinary
-        imagick: php-imagick
-        imap: php5.6-imap
-        intl: php5.6-intl
-        json: php5.6-json
-        ldap: php5.6-ldap
-        local_bin: /usr/local/bin
-        mail: php-mail
-        mbstring: php5.6-mbstring
-        mcrypt: php5.6-mcrypt
-        memcache: php-memcache
-        memcached: php-memcached
-        mongo: php-mongo
-        mongodb: php-mongodb
-        msgpack: php-msgpack
-        mysql: php5.6-mysql
-        mysqlnd: php5.6-mysql
-        net-smtp: php-net-smtp
-        net4: php-net-ipv4
-        net6: php-net-ipv6
-        oauth: php-oauth
-        odbc: php-odbc
-        opcache: php5.6-opcache
-        pear: php-pear
-        pgsql: php5.6-pgsql
-        php: php5.6
-        phpenmod_command: phpenmod -v5.6
-        pspell: php5.6-pspell
-        readline: php5.6-readline
-        redis: php-redis
-        seclib:
-        - php-phpseclib
-        - php-seclib
-        snmp: php5.6-snmp
-        soap: php5.6-soap
-        sqlite: php5.6-sqlite3
-        ssh2: php-ssh2
-        suhosin5_ext: suhosin.so
-        suhosin5_repo: https://github.com/sektioneins/suhosin
-        suhosin7_ext: suhosin7.so
-        suhosin7_repo: https://github.com/sektioneins/suhosin7
-        sybase: php5.6-sybase
-        tcpdf: php-tcpdf
-        temp_dir: /tmp
-        tidy: php5.6-tidy
-        xdebug: php-xdebug
-        xml:
-        - php5.6-xml
-        - php5.6-xmlrpc
-        xsl: php5.6-xsl
-        zip: php5.6-zip
-    modules:
-    - bz2
-    - cli
-    - curl
-    - gd
-    - imagick
-    - imap
-    - intl
-    - mbstring
-    - mysql
-    - readline
-    - redis
-    - xdebug
-    - xml
-    - zip
-    repo:
-      file: /etc/apt/sources.list.d/php-sury.list
-      humanname: php-sury repo
-      key_url: https://packages.sury.org/php/apt.gpg
-      name: deb https://packages.sury.org/php/ buster main
-    version:
-    - '5.6'
-    - '7.3'
+        global:
+          error_log: /var/log/php5.6-fpm.log
+          pid: /var/run/php5.6-fpm.pid
+        include: /etc/php/5.6/fpm/pool.d/*.conf
+      group: root
+      ini: /etc/php/5.6/fpm/php.ini
+      pools: /etc/php/5.6/fpm/pool.d
+      service: php5.6-fpm
+      user: root
+    hhvm:
+      conf: /etc/hhvm/server.ini
+      defaults: {}
+      ini: /etc/hhvm/php.ini
+      php:
+        hhvm.log.always_log_unhandled_exceptions: 'true'
+        hhvm.log.level: Warning
+        hhvm.log.runtime_error_reporting_level: '8191'
+        hhvm.mysql.typed_results: 'false'
+        session.gc_maxlifetime: '1440'
+        session.save_handler: files
+        session.save_path: /var/lib/hhvm/sessions
+      server:
+        hhvm.log.file: /var/log/hhvm/error.log
+        hhvm.log.use_log_file: 'true'
+        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
+        hhvm.server.default_document: index.php
+        hhvm.server.port: '9000'
+        hhvm.server.type: fastcgi
+        pid: /var/run/hhvm/pid
+      service: hhvm
+    pkgs:
+      adodb: libphp-adodb
+      apache2: libapache2-mod-php5.6
+      apc: php-apcu
+      apcu: php-apcu-bc
+      auth-sasl: php-auth-sasl
+      bcmath: php5.6-bcmath
+      build_pkgs:
+      - libssl-dev
+      - libcurl4-openssl-dev
+      - pkg-config
+      - libsslcommon2-dev
+      - gcc
+      - make
+      - autoconf
+      - libc-dev
+      - pkg-config
+      bz2: php5.6-bz2
+      cache-lite: php-cache-lite
+      cgi: php5.6-cgi
+      cli: php5.6-cli
+      composer_bin: composer
+      console-table: php-console-table
+      curl: php5.6-curl
+      dba: php5.6-dba
+      dev: php5.6-dev
+      ext_conf_path: /etc/php/5.6/mods-available
+      fpm: php5.6-fpm
+      gd: php5.6-gd
+      gearman: php-gearman
+      geoip: php-geoip
+      geshi: php-geshi
+      gettext: php5.6
+      gmp: php5.6-gmp
+      hhvm: hhvm
+      igbinary: php-igbinary
+      imagick: php-imagick
+      imap: php5.6-imap
+      intl: php5.6-intl
+      json: php5.6-json
+      ldap: php5.6-ldap
+      local_bin: /usr/local/bin
+      mail: php-mail
+      mbstring: php5.6-mbstring
+      mcrypt: php5.6-mcrypt
+      memcache: php-memcache
+      memcached: php-memcached
+      mongo: php-mongo
+      mongodb: php-mongodb
+      msgpack: php-msgpack
+      mysql: php5.6-mysql
+      mysqlnd: php5.6-mysql
+      net-smtp: php-net-smtp
+      net4: php-net-ipv4
+      net6: php-net-ipv6
+      oauth: php-oauth
+      odbc: php-odbc
+      opcache: php5.6-opcache
+      pear: php-pear
+      pgsql: php5.6-pgsql
+      php: php5.6
+      phpenmod_command: phpenmod -v5.6
+      pspell: php5.6-pspell
+      readline: php5.6-readline
+      redis: php-redis
+      seclib:
+      - php-phpseclib
+      - php-seclib
+      snmp: php5.6-snmp
+      soap: php5.6-soap
+      sqlite: php5.6-sqlite3
+      ssh2: php-ssh2
+      suhosin5_ext: suhosin.so
+      suhosin5_repo: https://github.com/sektioneins/suhosin
+      suhosin7_ext: suhosin7.so
+      suhosin7_repo: https://github.com/sektioneins/suhosin7
+      sybase: php5.6-sybase
+      tcpdf: php-tcpdf
+      temp_dir: /tmp
+      tidy: php5.6-tidy
+      xdebug: php-xdebug
+      xml:
+      - php5.6-xml
+      - php5.6-xmlrpc
+      xsl: php5.6-xsl
+      zip: php5.6-zip
+  modules:
+  - bz2
+  - cli
+  - curl
+  - gd
+  - imagick
+  - imap
+  - intl
+  - mbstring
+  - mysql
+  - readline
+  - redis
+  - xdebug
+  - xml
+  - zip
+  repo:
+    file: /etc/apt/sources.list.d/php-sury.list
+    humanname: php-sury repo
+    key_url: https://packages.sury.org/php/apt.gpg
+    name: deb https://packages.sury.org/php/ buster main
+  version:
+  - '5.6'
+  - '7.3'

test/integration/default/files/_mapdata/debian-9.yaml

@@ -2,12 +2,25 @@
 # Debian-9
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings:
+        Assertion:
+          zend.assertions: -1
+        Date:
+          date.timezone: Europe/Paris
+        PHP:
+          default_charset: UTF-8
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings:
@@ -16,377 +29,363 @@ values:
           Date:
             date.timezone: Europe/Paris
           PHP:
+            cgi.fix_pathinfo: 0
             default_charset: UTF-8
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings:
-            Assertion:
-              zend.assertions: -1
-            Date:
-              date.timezone: Europe/Paris
-            PHP:
-              cgi.fix_pathinfo: 0
-              default_charset: UTF-8
-              expose_php: 'Off'
-      pools:
-        ldap-admin.conf:
-          enabled: true
-          phpversion: '7.3'
-          settings:
-            ldap-admin:
-              catch_workers_output: 'yes'
-              group: www-data
-              listen: /tmp/php-fpm-ldap-admin2.sock
-              listen.mode: '0666'
-              php_admin_value[date.timezone]: Europe/Paris
-              ping.path: /php-ping
-              pm: static
-              pm.max_children: 3
-              pm.max_requests: 500
-              pm.status_path: /php-status
-              security.limit_extensions: .php
-              user: www-data
-        radius-admin.conf:
-          enabled: true
-          phpversion: '5.6'
-          settings:
-            radius-admin:
-              catch_workers_output: 'yes'
-              group: www-data
-              listen: /tmp/php-fpm-radius-admin.sock
-              listen.mode: '0666'
-              php_admin_value[date.timezone]: Europe/Paris
-              ping.path: /php-ping
-              pm: static
-              pm.max_children: 3
-              pm.max_requests: 500
-              pm.status_path: /php-status
-              security.limit_extensions: .php
-              user: www-data
-      service:
+            expose_php: 'Off'
+    pools:
+      ldap-admin.conf:
         enabled: true
-        opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
+        phpversion: '7.3'
+        settings:
+          ldap-admin:
+            catch_workers_output: 'yes'
+            group: www-data
+            listen: /tmp/php-fpm-ldap-admin2.sock
+            listen.mode: '0666'
+            php_admin_value[date.timezone]: Europe/Paris
+            ping.path: /php-ping
+            pm: static
+            pm.max_children: 3
+            pm.max_requests: 500
+            pm.status_path: /php-status
+            security.limit_extensions: .php
+            user: www-data
+      radius-admin.conf:
         enabled: true
+        phpversion: '5.6'
+        settings:
+          radius-admin:
+            catch_workers_output: 'yes'
+            group: www-data
+            listen: /tmp/php-fpm-radius-admin.sock
+            listen.mode: '0666'
+            php_admin_value[date.timezone]: Europe/Paris
+            ping.path: /php-ping
+            pm: static
+            pm.max_children: 3
+            pm.max_requests: 500
+            pm.status_path: /php-status
+            security.limit_extensions: .php
+            user: www-data
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
+        settings: {}
+      server:
+        opts: {}
+        settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    apache2:
+      ini: /etc/php/5.6/apache2/php.ini
+    cli:
+      ini: /etc/php/5.6/cli/php.ini
+    fpm:
+      conf: /etc/php/5.6/fpm/php-fpm.conf
       defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      apache2:
-        ini: /etc/php/5.6/apache2/php.ini
-      cli:
-        ini: /etc/php/5.6/cli/php.ini
-      fpm:
-        conf: /etc/php/5.6/fpm/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php5.6-fpm.log
-            pid: /var/run/php5.6-fpm.pid
-          include: /etc/php/5.6/fpm/pool.d/*.conf
-        group: root
-        ini: /etc/php/5.6/fpm/php.ini
-        pools: /etc/php/5.6/fpm/pool.d
-        service: php5.6-fpm
-        user: root
-      hhvm:
-        conf: /etc/hhvm/server.ini
-        defaults: {}
-        ini: /etc/hhvm/php.ini
-        php:
-          hhvm.log.always_log_unhandled_exceptions: 'true'
-          hhvm.log.level: Warning
-          hhvm.log.runtime_error_reporting_level: '8191'
-          hhvm.mysql.typed_results: 'false'
-          session.gc_maxlifetime: '1440'
-          session.save_handler: files
-          session.save_path: /var/lib/hhvm/sessions
-        server:
-          hhvm.log.file: /var/log/hhvm/error.log
-          hhvm.log.use_log_file: 'true'
-          hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-          hhvm.server.default_document: index.php
-          hhvm.server.port: '9000'
-          hhvm.server.type: fastcgi
-          pid: /var/run/hhvm/pid
-        service: hhvm
-      pkgs:
-        adodb: libphp-adodb
-        apache2: libapache2-mod-php5.6
-        apc: php-apcu
-        apcu: php-apcu-bc
-        auth-sasl: php-auth-sasl
-        bcmath: php5.6-bcmath
-        build_pkgs:
-        - libssl-dev
-        - libcurl4-openssl-dev
-        - pkg-config
-        - libsslcommon2-dev
-        - gcc
-        - make
-        - autoconf
-        - libc-dev
-        - pkg-config
-        bz2: php5.6-bz2
-        cache-lite: php-cache-lite
-        cgi: php5.6-cgi
-        cli: php5.6-cli
-        composer_bin: composer
-        console-table: php-console-table
-        curl: php5.6-curl
-        dba: php5.6-dba
-        dev: php5.6-dev
-        ext_conf_path: /etc/php/5.6/mods-available
-        fpm: php5.6-fpm
-        gd: php5.6-gd
-        gearman: php-gearman
-        geoip: php-geoip
-        geshi: php-geshi
-        gettext: php5.6
-        gmp: php5.6-gmp
-        hhvm: hhvm
-        igbinary: php-igbinary
-        imagick: php-imagick
-        imap: php5.6-imap
-        intl: php5.6-intl
-        json: php5.6-json
-        ldap: php5.6-ldap
-        local_bin: /usr/local/bin
-        mail: php-mail
-        mbstring: php5.6-mbstring
-        mcrypt: php5.6-mcrypt
-        memcache: php-memcache
-        memcached: php-memcached
-        mongo: php-mongo
-        mongodb: php-mongodb
-        msgpack: php-msgpack
-        mysql: php5.6-mysql
-        mysqlnd: php5.6-mysql
-        net-smtp: php-net-smtp
-        net4: php-net-ipv4
-        net6: php-net-ipv6
-        oauth: php-oauth
-        odbc: php-odbc
-        opcache: php5.6-opcache
-        pear: php-pear
-        pgsql: php5.6-pgsql
-        php: php5.6
-        phpenmod_command: phpenmod -v5.6
-        pspell: php5.6-pspell
-        readline: php5.6-readline
-        redis: php-redis
-        seclib:
-        - php-phpseclib
-        - php-seclib
-        snmp: php5.6-snmp
-        soap: php5.6-soap
-        sqlite: php5.6-sqlite3
-        ssh2: php-ssh2
-        suhosin5_ext: suhosin.so
-        suhosin5_repo: https://github.com/sektioneins/suhosin
-        suhosin7_ext: suhosin7.so
-        suhosin7_repo: https://github.com/sektioneins/suhosin7
-        sybase: php5.6-sybase
-        tcpdf: php-tcpdf
-        temp_dir: /tmp
-        tidy: php5.6-tidy
-        xdebug: php-xdebug
-        xml:
-        - php5.6-xml
-        - php5.6-xmlrpc
-        xsl: php5.6-xsl
-        zip: php5.6-zip
-    modules:
-    - bz2
-    - cli
-    - curl
-    - gd
-    - imagick
-    - imap
-    - intl
-    - mbstring
-    - mysql
-    - readline
-    - redis
-    - xdebug
-    - xml
-    - zip
-    repo:
-      file: /etc/apt/sources.list.d/php-sury.list
-      humanname: php-sury repo
-      key_url: https://packages.sury.org/php/apt.gpg
-      name: deb https://packages.sury.org/php/ stretch main
-    version:
-    - '5.6'
-    - '7.3'
+        global:
+          error_log: /var/log/php5.6-fpm.log
+          pid: /var/run/php5.6-fpm.pid
+        include: /etc/php/5.6/fpm/pool.d/*.conf
+      group: root
+      ini: /etc/php/5.6/fpm/php.ini
+      pools: /etc/php/5.6/fpm/pool.d
+      service: php5.6-fpm
+      user: root
+    hhvm:
+      conf: /etc/hhvm/server.ini
+      defaults: {}
+      ini: /etc/hhvm/php.ini
+      php:
+        hhvm.log.always_log_unhandled_exceptions: 'true'
+        hhvm.log.level: Warning
+        hhvm.log.runtime_error_reporting_level: '8191'
+        hhvm.mysql.typed_results: 'false'
+        session.gc_maxlifetime: '1440'
+        session.save_handler: files
+        session.save_path: /var/lib/hhvm/sessions
+      server:
+        hhvm.log.file: /var/log/hhvm/error.log
+        hhvm.log.use_log_file: 'true'
+        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
+        hhvm.server.default_document: index.php
+        hhvm.server.port: '9000'
+        hhvm.server.type: fastcgi
+        pid: /var/run/hhvm/pid
+      service: hhvm
+    pkgs:
+      adodb: libphp-adodb
+      apache2: libapache2-mod-php5.6
+      apc: php-apcu
+      apcu: php-apcu-bc
+      auth-sasl: php-auth-sasl
+      bcmath: php5.6-bcmath
+      build_pkgs:
+      - libssl-dev
+      - libcurl4-openssl-dev
+      - pkg-config
+      - libsslcommon2-dev
+      - gcc
+      - make
+      - autoconf
+      - libc-dev
+      - pkg-config
+      bz2: php5.6-bz2
+      cache-lite: php-cache-lite
+      cgi: php5.6-cgi
+      cli: php5.6-cli
+      composer_bin: composer
+      console-table: php-console-table
+      curl: php5.6-curl
+      dba: php5.6-dba
+      dev: php5.6-dev
+      ext_conf_path: /etc/php/5.6/mods-available
+      fpm: php5.6-fpm
+      gd: php5.6-gd
+      gearman: php-gearman
+      geoip: php-geoip
+      geshi: php-geshi
+      gettext: php5.6
+      gmp: php5.6-gmp
+      hhvm: hhvm
+      igbinary: php-igbinary
+      imagick: php-imagick
+      imap: php5.6-imap
+      intl: php5.6-intl
+      json: php5.6-json
+      ldap: php5.6-ldap
+      local_bin: /usr/local/bin
+      mail: php-mail
+      mbstring: php5.6-mbstring
+      mcrypt: php5.6-mcrypt
+      memcache: php-memcache
+      memcached: php-memcached
+      mongo: php-mongo
+      mongodb: php-mongodb
+      msgpack: php-msgpack
+      mysql: php5.6-mysql
+      mysqlnd: php5.6-mysql
+      net-smtp: php-net-smtp
+      net4: php-net-ipv4
+      net6: php-net-ipv6
+      oauth: php-oauth
+      odbc: php-odbc
+      opcache: php5.6-opcache
+      pear: php-pear
+      pgsql: php5.6-pgsql
+      php: php5.6
+      phpenmod_command: phpenmod -v5.6
+      pspell: php5.6-pspell
+      readline: php5.6-readline
+      redis: php-redis
+      seclib:
+      - php-phpseclib
+      - php-seclib
+      snmp: php5.6-snmp
+      soap: php5.6-soap
+      sqlite: php5.6-sqlite3
+      ssh2: php-ssh2
+      suhosin5_ext: suhosin.so
+      suhosin5_repo: https://github.com/sektioneins/suhosin
+      suhosin7_ext: suhosin7.so
+      suhosin7_repo: https://github.com/sektioneins/suhosin7
+      sybase: php5.6-sybase
+      tcpdf: php-tcpdf
+      temp_dir: /tmp
+      tidy: php5.6-tidy
+      xdebug: php-xdebug
+      xml:
+      - php5.6-xml
+      - php5.6-xmlrpc
+      xsl: php5.6-xsl
+      zip: php5.6-zip
+  modules:
+  - bz2
+  - cli
+  - curl
+  - gd
+  - imagick
+  - imap
+  - intl
+  - mbstring
+  - mysql
+  - readline
+  - redis
+  - xdebug
+  - xml
+  - zip
+  repo:
+    file: /etc/apt/sources.list.d/php-sury.list
+    humanname: php-sury repo
+    key_url: https://packages.sury.org/php/apt.gpg
+    name: deb https://packages.sury.org/php/ stretch main
+  version:
+  - '5.6'
+  - '7.3'

test/integration/default/files/_mapdata/fedora-30.yaml

@@ -2,324 +2,323 @@
 # Fedora-30
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings: {}
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings: {}
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings: {}
-      pools:
-        default.conf:
-          enabled: false
-          opts: {}
-      service:
-        enabled: true
+    pools:
+      default.conf:
+        enabled: false
         opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
-        enabled: true
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
-      defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      cli:
-        ini: /etc/php.ini
-      fpm:
-        conf: /etc/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php-fpm/error.log
-            pid: /var/run/php-fpm/php-fpm.pid
-          include: /etc/php-fpm.d/*.conf
-        group: root
-        ini: /etc/php.ini
-        pools: /etc/php-fpm.d
-        service: php-fpm
-        user: root
-      pkgs:
-        adodb: php-adodb
-        apc: php-pecl-apc
-        apcu: php-pecl-apcu
-        auth-sasl: php-pear-Auth-SASL
-        bcmath: php-bcmath
-        build_pkgs:
-        - openssl-devel
-        - gcc
-        cache-lite: php-pear-Cache-Lite
-        cgi: php-cgi
-        cli: php-cli
-        composer: composer
-        composer_bin: composer
-        console-table: php-pear-Console-Table
-        curl:
-        - php-common
-        - curl
-        dba:
-        - php-dba
-        - dba
-        dev: php-devel
-        ext_conf_path: /etc/php.d
-        fpm: php-fpm
-        gd: php-gd
-        geoip: php-pecl-geoip
-        geshi: php-geshi
-        gettext: php-php-gettext
-        http: php-pecl-http
-        imagick: php-pecl-imagick
-        imap: php-imap
-        intl: php-intl
-        json: php-common
-        ldap: php-ldap
-        local_bin: /usr/local/bin
-        mail: php-pear-Mail
-        mbstring: php-mbstring
-        mcrypt: php-mcrypt
-        memcache: php-pecl-memcache
-        memcached: php-pecl-memcached
-        mysql: php-mysql
-        mysqlnd: php-mysqlnd
-        net-smtp: php-pear-Net-SMTP
-        net4: php-pear-Net-IPv4
-        oauth: php-pecl-oauth
-        opcache: php-pecl-zendopcache
-        pear: php-pear
-        pgsql: php-pgsql
-        php: php
-        pspell: php-pspell
-        redis: php-pecl-redis
-        seclib: php-phpseclib
-        snmp: php-snmp
-        soap: php-soap
-        sqlite: php-pdo
-        ssh2: php-pecl-ssh2
-        suhosin5_ext: suhosin.so
-        suhosin5_repo: https://github.com/sektioneins/suhosin
-        suhosin7_ext: suhosin7.so
-        suhosin7_repo: https://github.com/sektioneins/suhosin7
-        tcpdf: php-tcpdf
-        temp_dir: /tmp
-        tidy: php-tidy
-        uuid: php-pecl-uuid
-        xcache: php-xcache
-        xdebug: php-pecl-xdebug
-        xml:
-        - php-xml
-        - php-xmlrpc
-        xsl: php-xml
-        zip: php
-      xcache:
-        ini: /etc/php.d/xcache.ini
-    xcache:
-      ini:
-        defaults:
-          xcache:
-            xcache.cacher: 'On'
-            xcache.coredump_directory: '""'
-            xcache.coredump_type: '0'
-            xcache.count: '1'
-            xcache.disable_on_crash: 'Off'
-            xcache.experimental: 'Off'
-            xcache.gc_interval: '0'
-            xcache.mmap_path: '"/dev/zero"'
-            xcache.optimizer: 'Off'
-            xcache.readonly_protection: 'Off'
-            xcache.shm_scheme: '"mmap"'
-            xcache.size: 60M
-            xcache.slots: 8K
-            xcache.stat: 'On'
-            xcache.ttl: '0'
-            xcache.var_count: '1'
-            xcache.var_gc_interval: '300'
-            xcache.var_maxttl: '0'
-            xcache.var_namespace: '""'
-            xcache.var_namespace_mode: '0'
-            xcache.var_size: 4M
-            xcache.var_slots: 8K
-            xcache.var_ttl: '0'
-          xcache-common:
-            extension: xcache.so
-          xcache.admin:
-            xcache.admin.enable_auth: 'On'
-          xcache.coverager:
-            xcache.coveragedump_directory: '""'
-            xcache.coverager: 'Off'
-            xcache.coverager_autostart: 'On'
+        settings: {}
+      server:
         opts: {}
         settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    cli:
+      ini: /etc/php.ini
+    fpm:
+      conf: /etc/php-fpm.conf
+      defaults:
+        global:
+          error_log: /var/log/php-fpm/error.log
+          pid: /var/run/php-fpm/php-fpm.pid
+        include: /etc/php-fpm.d/*.conf
+      group: root
+      ini: /etc/php.ini
+      pools: /etc/php-fpm.d
+      service: php-fpm
+      user: root
+    pkgs:
+      adodb: php-adodb
+      apc: php-pecl-apc
+      apcu: php-pecl-apcu
+      auth-sasl: php-pear-Auth-SASL
+      bcmath: php-bcmath
+      build_pkgs:
+      - openssl-devel
+      - gcc
+      cache-lite: php-pear-Cache-Lite
+      cgi: php-cgi
+      cli: php-cli
+      composer: composer
+      composer_bin: composer
+      console-table: php-pear-Console-Table
+      curl:
+      - php-common
+      - curl
+      dba:
+      - php-dba
+      - dba
+      dev: php-devel
+      ext_conf_path: /etc/php.d
+      fpm: php-fpm
+      gd: php-gd
+      geoip: php-pecl-geoip
+      geshi: php-geshi
+      gettext: php-php-gettext
+      http: php-pecl-http
+      imagick: php-pecl-imagick
+      imap: php-imap
+      intl: php-intl
+      json: php-common
+      ldap: php-ldap
+      local_bin: /usr/local/bin
+      mail: php-pear-Mail
+      mbstring: php-mbstring
+      mcrypt: php-mcrypt
+      memcache: php-pecl-memcache
+      memcached: php-pecl-memcached
+      mysql: php-mysql
+      mysqlnd: php-mysqlnd
+      net-smtp: php-pear-Net-SMTP
+      net4: php-pear-Net-IPv4
+      oauth: php-pecl-oauth
+      opcache: php-pecl-zendopcache
+      pear: php-pear
+      pgsql: php-pgsql
+      php: php
+      pspell: php-pspell
+      redis: php-pecl-redis
+      seclib: php-phpseclib
+      snmp: php-snmp
+      soap: php-soap
+      sqlite: php-pdo
+      ssh2: php-pecl-ssh2
+      suhosin5_ext: suhosin.so
+      suhosin5_repo: https://github.com/sektioneins/suhosin
+      suhosin7_ext: suhosin7.so
+      suhosin7_repo: https://github.com/sektioneins/suhosin7
+      tcpdf: php-tcpdf
+      temp_dir: /tmp
+      tidy: php-tidy
+      uuid: php-pecl-uuid
+      xcache: php-xcache
+      xdebug: php-pecl-xdebug
+      xml:
+      - php-xml
+      - php-xmlrpc
+      xsl: php-xml
+      zip: php
+    xcache:
+      ini: /etc/php.d/xcache.ini
+  xcache:
+    ini:
+      defaults:
+        xcache:
+          xcache.cacher: 'On'
+          xcache.coredump_directory: '""'
+          xcache.coredump_type: '0'
+          xcache.count: '1'
+          xcache.disable_on_crash: 'Off'
+          xcache.experimental: 'Off'
+          xcache.gc_interval: '0'
+          xcache.mmap_path: '"/dev/zero"'
+          xcache.optimizer: 'Off'
+          xcache.readonly_protection: 'Off'
+          xcache.shm_scheme: '"mmap"'
+          xcache.size: 60M
+          xcache.slots: 8K
+          xcache.stat: 'On'
+          xcache.ttl: '0'
+          xcache.var_count: '1'
+          xcache.var_gc_interval: '300'
+          xcache.var_maxttl: '0'
+          xcache.var_namespace: '""'
+          xcache.var_namespace_mode: '0'
+          xcache.var_size: 4M
+          xcache.var_slots: 8K
+          xcache.var_ttl: '0'
+        xcache-common:
+          extension: xcache.so
+        xcache.admin:
+          xcache.admin.enable_auth: 'On'
+        xcache.coverager:
+          xcache.coveragedump_directory: '""'
+          xcache.coverager: 'Off'
+          xcache.coverager_autostart: 'On'
+      opts: {}
+      settings: {}

test/integration/default/files/_mapdata/fedora-31.yaml

@@ -2,324 +2,323 @@
 # Fedora-31
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings: {}
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings: {}
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings: {}
-      pools:
-        default.conf:
-          enabled: false
-          opts: {}
-      service:
-        enabled: true
+    pools:
+      default.conf:
+        enabled: false
         opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
-        enabled: true
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
-      defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      cli:
-        ini: /etc/php.ini
-      fpm:
-        conf: /etc/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php-fpm/error.log
-            pid: /var/run/php-fpm/php-fpm.pid
-          include: /etc/php-fpm.d/*.conf
-        group: root
-        ini: /etc/php.ini
-        pools: /etc/php-fpm.d
-        service: php-fpm
-        user: root
-      pkgs:
-        adodb: php-adodb
-        apc: php-pecl-apc
-        apcu: php-pecl-apcu
-        auth-sasl: php-pear-Auth-SASL
-        bcmath: php-bcmath
-        build_pkgs:
-        - openssl-devel
-        - gcc
-        cache-lite: php-pear-Cache-Lite
-        cgi: php-cgi
-        cli: php-cli
-        composer: composer
-        composer_bin: composer
-        console-table: php-pear-Console-Table
-        curl:
-        - php-common
-        - curl
-        dba:
-        - php-dba
-        - dba
-        dev: php-devel
-        ext_conf_path: /etc/php.d
-        fpm: php-fpm
-        gd: php-gd
-        geoip: php-pecl-geoip
-        geshi: php-geshi
-        gettext: php-php-gettext
-        http: php-pecl-http
-        imagick: php-pecl-imagick
-        imap: php-imap
-        intl: php-intl
-        json: php-common
-        ldap: php-ldap
-        local_bin: /usr/local/bin
-        mail: php-pear-Mail
-        mbstring: php-mbstring
-        mcrypt: php-mcrypt
-        memcache: php-pecl-memcache
-        memcached: php-pecl-memcached
-        mysql: php-mysql
-        mysqlnd: php-mysqlnd
-        net-smtp: php-pear-Net-SMTP
-        net4: php-pear-Net-IPv4
-        oauth: php-pecl-oauth
-        opcache: php-pecl-zendopcache
-        pear: php-pear
-        pgsql: php-pgsql
-        php: php
-        pspell: php-pspell
-        redis: php-pecl-redis
-        seclib: php-phpseclib
-        snmp: php-snmp
-        soap: php-soap
-        sqlite: php-pdo
-        ssh2: php-pecl-ssh2
-        suhosin5_ext: suhosin.so
-        suhosin5_repo: https://github.com/sektioneins/suhosin
-        suhosin7_ext: suhosin7.so
-        suhosin7_repo: https://github.com/sektioneins/suhosin7
-        tcpdf: php-tcpdf
-        temp_dir: /tmp
-        tidy: php-tidy
-        uuid: php-pecl-uuid
-        xcache: php-xcache
-        xdebug: php-pecl-xdebug
-        xml:
-        - php-xml
-        - php-xmlrpc
-        xsl: php-xml
-        zip: php
-      xcache:
-        ini: /etc/php.d/xcache.ini
-    xcache:
-      ini:
-        defaults:
-          xcache:
-            xcache.cacher: 'On'
-            xcache.coredump_directory: '""'
-            xcache.coredump_type: '0'
-            xcache.count: '1'
-            xcache.disable_on_crash: 'Off'
-            xcache.experimental: 'Off'
-            xcache.gc_interval: '0'
-            xcache.mmap_path: '"/dev/zero"'
-            xcache.optimizer: 'Off'
-            xcache.readonly_protection: 'Off'
-            xcache.shm_scheme: '"mmap"'
-            xcache.size: 60M
-            xcache.slots: 8K
-            xcache.stat: 'On'
-            xcache.ttl: '0'
-            xcache.var_count: '1'
-            xcache.var_gc_interval: '300'
-            xcache.var_maxttl: '0'
-            xcache.var_namespace: '""'
-            xcache.var_namespace_mode: '0'
-            xcache.var_size: 4M
-            xcache.var_slots: 8K
-            xcache.var_ttl: '0'
-          xcache-common:
-            extension: xcache.so
-          xcache.admin:
-            xcache.admin.enable_auth: 'On'
-          xcache.coverager:
-            xcache.coveragedump_directory: '""'
-            xcache.coverager: 'Off'
-            xcache.coverager_autostart: 'On'
+        settings: {}
+      server:
         opts: {}
         settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    cli:
+      ini: /etc/php.ini
+    fpm:
+      conf: /etc/php-fpm.conf
+      defaults:
+        global:
+          error_log: /var/log/php-fpm/error.log
+          pid: /var/run/php-fpm/php-fpm.pid
+        include: /etc/php-fpm.d/*.conf
+      group: root
+      ini: /etc/php.ini
+      pools: /etc/php-fpm.d
+      service: php-fpm
+      user: root
+    pkgs:
+      adodb: php-adodb
+      apc: php-pecl-apc
+      apcu: php-pecl-apcu
+      auth-sasl: php-pear-Auth-SASL
+      bcmath: php-bcmath
+      build_pkgs:
+      - openssl-devel
+      - gcc
+      cache-lite: php-pear-Cache-Lite
+      cgi: php-cgi
+      cli: php-cli
+      composer: composer
+      composer_bin: composer
+      console-table: php-pear-Console-Table
+      curl:
+      - php-common
+      - curl
+      dba:
+      - php-dba
+      - dba
+      dev: php-devel
+      ext_conf_path: /etc/php.d
+      fpm: php-fpm
+      gd: php-gd
+      geoip: php-pecl-geoip
+      geshi: php-geshi
+      gettext: php-php-gettext
+      http: php-pecl-http
+      imagick: php-pecl-imagick
+      imap: php-imap
+      intl: php-intl
+      json: php-common
+      ldap: php-ldap
+      local_bin: /usr/local/bin
+      mail: php-pear-Mail
+      mbstring: php-mbstring
+      mcrypt: php-mcrypt
+      memcache: php-pecl-memcache
+      memcached: php-pecl-memcached
+      mysql: php-mysql
+      mysqlnd: php-mysqlnd
+      net-smtp: php-pear-Net-SMTP
+      net4: php-pear-Net-IPv4
+      oauth: php-pecl-oauth
+      opcache: php-pecl-zendopcache
+      pear: php-pear
+      pgsql: php-pgsql
+      php: php
+      pspell: php-pspell
+      redis: php-pecl-redis
+      seclib: php-phpseclib
+      snmp: php-snmp
+      soap: php-soap
+      sqlite: php-pdo
+      ssh2: php-pecl-ssh2
+      suhosin5_ext: suhosin.so
+      suhosin5_repo: https://github.com/sektioneins/suhosin
+      suhosin7_ext: suhosin7.so
+      suhosin7_repo: https://github.com/sektioneins/suhosin7
+      tcpdf: php-tcpdf
+      temp_dir: /tmp
+      tidy: php-tidy
+      uuid: php-pecl-uuid
+      xcache: php-xcache
+      xdebug: php-pecl-xdebug
+      xml:
+      - php-xml
+      - php-xmlrpc
+      xsl: php-xml
+      zip: php
+    xcache:
+      ini: /etc/php.d/xcache.ini
+  xcache:
+    ini:
+      defaults:
+        xcache:
+          xcache.cacher: 'On'
+          xcache.coredump_directory: '""'
+          xcache.coredump_type: '0'
+          xcache.count: '1'
+          xcache.disable_on_crash: 'Off'
+          xcache.experimental: 'Off'
+          xcache.gc_interval: '0'
+          xcache.mmap_path: '"/dev/zero"'
+          xcache.optimizer: 'Off'
+          xcache.readonly_protection: 'Off'
+          xcache.shm_scheme: '"mmap"'
+          xcache.size: 60M
+          xcache.slots: 8K
+          xcache.stat: 'On'
+          xcache.ttl: '0'
+          xcache.var_count: '1'
+          xcache.var_gc_interval: '300'
+          xcache.var_maxttl: '0'
+          xcache.var_namespace: '""'
+          xcache.var_namespace_mode: '0'
+          xcache.var_size: 4M
+          xcache.var_slots: 8K
+          xcache.var_ttl: '0'
+        xcache-common:
+          extension: xcache.so
+        xcache.admin:
+          xcache.admin.enable_auth: 'On'
+        xcache.coverager:
+          xcache.coveragedump_directory: '""'
+          xcache.coverager: 'Off'
+          xcache.coverager_autostart: 'On'
+      opts: {}
+      settings: {}

test/integration/default/files/_mapdata/opensuse-15.yaml

@@ -2,278 +2,277 @@
 # Leap-15
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings: {}
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings: {}
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings: {}
-      pools:
-        default.conf:
-          enabled: false
-          opts: {}
-      service:
-        enabled: true
+    pools:
+      default.conf:
+        enabled: false
         opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
-        enabled: true
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
-      defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      cli:
-        ini: /etc/php.ini
-      fpm:
-        conf: /etc/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php-fpm/error.log
-            pid: /var/run/php-fpm/php-fpm.pid
-          include: /etc/php-fpm.d/*.conf
-        group: root
-        ini: /etc/php.ini
-        pools: /etc/php-fpm.d
-        service: php-fpm
-        user: root
-      pkgs:
-        adodb: php5-dba
-        apache2: apache2-mod_php5
-        cli: php5
-        curl: php5-curl
-        fpm: php5-fpm
-        gd: php5-gd
-        imap: php5-imap
-        intl: php5-intl
-        json: php5-json
-        ldap: php5-ldap
-        mbstring: php5-mbstring
-        mcrypt: php5-mcrypt
-        mysql: php5-mysql
-        oauth: php5-oauth
-        pear: php5-pear
-        pgsql: php5-pgsql
-        php: php7
-        snmp: php5-snmp
-        soap: php5-soap
-        sqlite: php5-sqlite
-        suhosin: php5-suhosin
-        xml:
-        - php5-xmlreader
-        - php5-xmlwriter
-        - php5-xmlrpc
-        zip: php5-zip
-    xcache:
-      ini:
-        defaults:
-          xcache:
-            xcache.cacher: 'On'
-            xcache.coredump_directory: '""'
-            xcache.coredump_type: '0'
-            xcache.count: '1'
-            xcache.disable_on_crash: 'Off'
-            xcache.experimental: 'Off'
-            xcache.gc_interval: '0'
-            xcache.mmap_path: '"/dev/zero"'
-            xcache.optimizer: 'Off'
-            xcache.readonly_protection: 'Off'
-            xcache.shm_scheme: '"mmap"'
-            xcache.size: 60M
-            xcache.slots: 8K
-            xcache.stat: 'On'
-            xcache.ttl: '0'
-            xcache.var_count: '1'
-            xcache.var_gc_interval: '300'
-            xcache.var_maxttl: '0'
-            xcache.var_namespace: '""'
-            xcache.var_namespace_mode: '0'
-            xcache.var_size: 4M
-            xcache.var_slots: 8K
-            xcache.var_ttl: '0'
-          xcache-common:
-            extension: xcache.so
-          xcache.admin:
-            xcache.admin.enable_auth: 'On'
-          xcache.coverager:
-            xcache.coveragedump_directory: '""'
-            xcache.coverager: 'Off'
-            xcache.coverager_autostart: 'On'
+        settings: {}
+      server:
         opts: {}
         settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    cli:
+      ini: /etc/php.ini
+    fpm:
+      conf: /etc/php-fpm.conf
+      defaults:
+        global:
+          error_log: /var/log/php-fpm/error.log
+          pid: /var/run/php-fpm/php-fpm.pid
+        include: /etc/php-fpm.d/*.conf
+      group: root
+      ini: /etc/php.ini
+      pools: /etc/php-fpm.d
+      service: php-fpm
+      user: root
+    pkgs:
+      adodb: php5-dba
+      apache2: apache2-mod_php5
+      cli: php5
+      curl: php5-curl
+      fpm: php5-fpm
+      gd: php5-gd
+      imap: php5-imap
+      intl: php5-intl
+      json: php5-json
+      ldap: php5-ldap
+      mbstring: php5-mbstring
+      mcrypt: php5-mcrypt
+      mysql: php5-mysql
+      oauth: php5-oauth
+      pear: php5-pear
+      pgsql: php5-pgsql
+      php: php7
+      snmp: php5-snmp
+      soap: php5-soap
+      sqlite: php5-sqlite
+      suhosin: php5-suhosin
+      xml:
+      - php5-xmlreader
+      - php5-xmlwriter
+      - php5-xmlrpc
+      zip: php5-zip
+  xcache:
+    ini:
+      defaults:
+        xcache:
+          xcache.cacher: 'On'
+          xcache.coredump_directory: '""'
+          xcache.coredump_type: '0'
+          xcache.count: '1'
+          xcache.disable_on_crash: 'Off'
+          xcache.experimental: 'Off'
+          xcache.gc_interval: '0'
+          xcache.mmap_path: '"/dev/zero"'
+          xcache.optimizer: 'Off'
+          xcache.readonly_protection: 'Off'
+          xcache.shm_scheme: '"mmap"'
+          xcache.size: 60M
+          xcache.slots: 8K
+          xcache.stat: 'On'
+          xcache.ttl: '0'
+          xcache.var_count: '1'
+          xcache.var_gc_interval: '300'
+          xcache.var_maxttl: '0'
+          xcache.var_namespace: '""'
+          xcache.var_namespace_mode: '0'
+          xcache.var_size: 4M
+          xcache.var_slots: 8K
+          xcache.var_ttl: '0'
+        xcache-common:
+          extension: xcache.so
+        xcache.admin:
+          xcache.admin.enable_auth: 'On'
+        xcache.coverager:
+          xcache.coveragedump_directory: '""'
+          xcache.coverager: 'Off'
+          xcache.coverager_autostart: 'On'
+      opts: {}
+      settings: {}

test/integration/default/files/_mapdata/ubuntu-16.yaml

@@ -2,12 +2,25 @@
 # Ubuntu-16.04
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings:
+        Assertion:
+          zend.assertions: -1
+        Date:
+          date.timezone: Europe/Paris
+        PHP:
+          default_charset: UTF-8
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings:
@@ -16,376 +29,362 @@ values:
           Date:
             date.timezone: Europe/Paris
           PHP:
+            cgi.fix_pathinfo: 0
             default_charset: UTF-8
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings:
-            Assertion:
-              zend.assertions: -1
-            Date:
-              date.timezone: Europe/Paris
-            PHP:
-              cgi.fix_pathinfo: 0
-              default_charset: UTF-8
-              expose_php: 'Off'
-      pools:
-        ldap-admin.conf:
-          enabled: true
-          phpversion: '7.3'
-          settings:
-            ldap-admin:
-              catch_workers_output: 'yes'
-              group: www-data
-              listen: /tmp/php-fpm-ldap-admin2.sock
-              listen.mode: '0666'
-              php_admin_value[date.timezone]: Europe/Paris
-              ping.path: /php-ping
-              pm: static
-              pm.max_children: 3
-              pm.max_requests: 500
-              pm.status_path: /php-status
-              security.limit_extensions: .php
-              user: www-data
-        radius-admin.conf:
-          enabled: true
-          phpversion: '5.6'
-          settings:
-            radius-admin:
-              catch_workers_output: 'yes'
-              group: www-data
-              listen: /tmp/php-fpm-radius-admin.sock
-              listen.mode: '0666'
-              php_admin_value[date.timezone]: Europe/Paris
-              ping.path: /php-ping
-              pm: static
-              pm.max_children: 3
-              pm.max_requests: 500
-              pm.status_path: /php-status
-              security.limit_extensions: .php
-              user: www-data
-      service:
+            expose_php: 'Off'
+    pools:
+      ldap-admin.conf:
         enabled: true
-        opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
+        phpversion: '7.3'
+        settings:
+          ldap-admin:
+            catch_workers_output: 'yes'
+            group: www-data
+            listen: /tmp/php-fpm-ldap-admin2.sock
+            listen.mode: '0666'
+            php_admin_value[date.timezone]: Europe/Paris
+            ping.path: /php-ping
+            pm: static
+            pm.max_children: 3
+            pm.max_requests: 500
+            pm.status_path: /php-status
+            security.limit_extensions: .php
+            user: www-data
+      radius-admin.conf:
         enabled: true
+        phpversion: '5.6'
+        settings:
+          radius-admin:
+            catch_workers_output: 'yes'
+            group: www-data
+            listen: /tmp/php-fpm-radius-admin.sock
+            listen.mode: '0666'
+            php_admin_value[date.timezone]: Europe/Paris
+            ping.path: /php-ping
+            pm: static
+            pm.max_children: 3
+            pm.max_requests: 500
+            pm.status_path: /php-status
+            security.limit_extensions: .php
+            user: www-data
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
+        settings: {}
+      server:
+        opts: {}
+        settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    apache2:
+      ini: /etc/php/5.6/apache2/php.ini
+    cli:
+      ini: /etc/php/5.6/cli/php.ini
+    fpm:
+      conf: /etc/php/5.6/fpm/php-fpm.conf
       defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      apache2:
-        ini: /etc/php/5.6/apache2/php.ini
-      cli:
-        ini: /etc/php/5.6/cli/php.ini
-      fpm:
-        conf: /etc/php/5.6/fpm/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php5.6-fpm.log
-            pid: /run/php/php5.6-fpm.pid
-          include: /etc/php/5.6/fpm/pool.d/*.conf
-        group: root
-        ini: /etc/php/5.6/fpm/php.ini
-        pools: /etc/php/5.6/fpm/pool.d
-        service: php5.6-fpm
-        user: root
-      hhvm:
-        conf: /etc/hhvm/server.ini
-        defaults: {}
-        ini: /etc/hhvm/php.ini
-        php:
-          hhvm.log.always_log_unhandled_exceptions: 'true'
-          hhvm.log.level: Warning
-          hhvm.log.runtime_error_reporting_level: '8191'
-          hhvm.mysql.typed_results: 'false'
-          session.gc_maxlifetime: '1440'
-          session.save_handler: files
-          session.save_path: /var/lib/hhvm/sessions
-        server:
-          hhvm.log.file: /var/log/hhvm/error.log
-          hhvm.log.use_log_file: 'true'
-          hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-          hhvm.server.default_document: index.php
-          hhvm.server.port: '9000'
-          hhvm.server.type: fastcgi
-          pid: /var/run/hhvm/pid
-        service: hhvm
-      pkgs:
-        adodb: libphp-adodb
-        apache2: libapache2-mod-php5.6
-        apc: php-apcu
-        apcu: php-apcu-bc
-        auth-sasl: php-auth-sasl
-        bcmath: php5.6-bcmath
-        build_pkgs:
-        - libssl-dev
-        - libcurl4-openssl-dev
-        - pkg-config
-        - libsslcommon2-dev
-        - gcc
-        - make
-        - autoconf
-        - libc-dev
-        - pkg-config
-        bz2: php5.6-bz2
-        cache-lite: php-cache-lite
-        cgi: php5.6-cgi
-        cli: php5.6-cli
-        composer_bin: composer
-        console-table: php-console-table
-        curl: php5.6-curl
-        dba: php5.6-dba
-        dev: php5.6-dev
-        ext_conf_path: /etc/php/5.6/mods-available
-        fpm: php5.6-fpm
-        gd: php5.6-gd
-        gearman: php-gearman
-        geoip: php-geoip
-        geshi: php-geshi
-        gettext: php5.6
-        gmp: php5.6-gmp
-        hhvm: hhvm
-        imagick: php-imagick
-        imap: php5.6-imap
-        intl: php5.6-intl
-        json: php5.6-json
-        ldap: php5.6-ldap
-        local_bin: /usr/local/bin
-        mail: php-mail
-        mbstring: php5.6-mbstring
-        mcrypt: php5.6-mcrypt
-        memcache: php-memcache
-        memcached: php-memcached
-        mongo: php-mongo
-        mongodb: php-mongodb
-        mysql: php5.6-mysql
-        mysqlnd: php5.6-mysql
-        net-smtp: php-net-smtp
-        net4: php-net-ipv4
-        net6: php-net-ipv6
-        oauth: php-oauth
-        odbc: php-odbc
-        opcache: php5.6-opcache
-        pear: php-pear
-        pgsql: php5.6-pgsql
-        php: php5.6
-        phpenmod_command: phpenmod -v5.6
-        pspell: php5.6-pspell
-        readline: php5.6-readline
-        redis: php-redis
-        seclib:
-        - php-phpseclib
-        - php-seclib
-        snmp: php5.6-snmp
-        soap: php5.6-soap
-        sqlite: php5.6-sqlite3
-        ssh2: php-ssh2
-        suhosin5_ext: suhosin.so
-        suhosin5_repo: https://github.com/sektioneins/suhosin
-        suhosin7_ext: suhosin7.so
-        suhosin7_repo: https://github.com/sektioneins/suhosin7
-        sybase: php5.6-sybase
-        tcpdf: php-tcpdf
-        temp_dir: /tmp
-        tidy: php5.6-tidy
-        xdebug: php-xdebug
-        xml:
-        - php5.6-xml
-        - php5.6-xmlrpc
-        xsl: php5.6-xsl
-        zip: php5.6-zip
-    modules:
-    - bz2
-    - cli
-    - curl
-    - gd
-    - imagick
-    - imap
-    - intl
-    - mbstring
-    - mysql
-    - readline
-    - redis
-    - xdebug
-    - xml
-    - zip
-    repo:
-      file: /etc/apt/sources.list.d/php-sury.list
-      humanname: php-sury ppa
-      key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c
-      name: deb http://ppa.launchpad.net/ondrej/php/ubuntu xenial main
-    use_external_repo: true
-    version:
-    - '5.6'
-    - '7.3'
+        global:
+          error_log: /var/log/php5.6-fpm.log
+          pid: /run/php/php5.6-fpm.pid
+        include: /etc/php/5.6/fpm/pool.d/*.conf
+      group: root
+      ini: /etc/php/5.6/fpm/php.ini
+      pools: /etc/php/5.6/fpm/pool.d
+      service: php5.6-fpm
+      user: root
+    hhvm:
+      conf: /etc/hhvm/server.ini
+      defaults: {}
+      ini: /etc/hhvm/php.ini
+      php:
+        hhvm.log.always_log_unhandled_exceptions: 'true'
+        hhvm.log.level: Warning
+        hhvm.log.runtime_error_reporting_level: '8191'
+        hhvm.mysql.typed_results: 'false'
+        session.gc_maxlifetime: '1440'
+        session.save_handler: files
+        session.save_path: /var/lib/hhvm/sessions
+      server:
+        hhvm.log.file: /var/log/hhvm/error.log
+        hhvm.log.use_log_file: 'true'
+        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
+        hhvm.server.default_document: index.php
+        hhvm.server.port: '9000'
+        hhvm.server.type: fastcgi
+        pid: /var/run/hhvm/pid
+      service: hhvm
+    pkgs:
+      adodb: libphp-adodb
+      apache2: libapache2-mod-php5.6
+      apc: php-apcu
+      apcu: php-apcu-bc
+      auth-sasl: php-auth-sasl
+      bcmath: php5.6-bcmath
+      build_pkgs:
+      - libssl-dev
+      - libcurl4-openssl-dev
+      - pkg-config
+      - libsslcommon2-dev
+      - gcc
+      - make
+      - autoconf
+      - libc-dev
+      - pkg-config
+      bz2: php5.6-bz2
+      cache-lite: php-cache-lite
+      cgi: php5.6-cgi
+      cli: php5.6-cli
+      composer_bin: composer
+      console-table: php-console-table
+      curl: php5.6-curl
+      dba: php5.6-dba
+      dev: php5.6-dev
+      ext_conf_path: /etc/php/5.6/mods-available
+      fpm: php5.6-fpm
+      gd: php5.6-gd
+      gearman: php-gearman
+      geoip: php-geoip
+      geshi: php-geshi
+      gettext: php5.6
+      gmp: php5.6-gmp
+      hhvm: hhvm
+      imagick: php-imagick
+      imap: php5.6-imap
+      intl: php5.6-intl
+      json: php5.6-json
+      ldap: php5.6-ldap
+      local_bin: /usr/local/bin
+      mail: php-mail
+      mbstring: php5.6-mbstring
+      mcrypt: php5.6-mcrypt
+      memcache: php-memcache
+      memcached: php-memcached
+      mongo: php-mongo
+      mongodb: php-mongodb
+      mysql: php5.6-mysql
+      mysqlnd: php5.6-mysql
+      net-smtp: php-net-smtp
+      net4: php-net-ipv4
+      net6: php-net-ipv6
+      oauth: php-oauth
+      odbc: php-odbc
+      opcache: php5.6-opcache
+      pear: php-pear
+      pgsql: php5.6-pgsql
+      php: php5.6
+      phpenmod_command: phpenmod -v5.6
+      pspell: php5.6-pspell
+      readline: php5.6-readline
+      redis: php-redis
+      seclib:
+      - php-phpseclib
+      - php-seclib
+      snmp: php5.6-snmp
+      soap: php5.6-soap
+      sqlite: php5.6-sqlite3
+      ssh2: php-ssh2
+      suhosin5_ext: suhosin.so
+      suhosin5_repo: https://github.com/sektioneins/suhosin
+      suhosin7_ext: suhosin7.so
+      suhosin7_repo: https://github.com/sektioneins/suhosin7
+      sybase: php5.6-sybase
+      tcpdf: php-tcpdf
+      temp_dir: /tmp
+      tidy: php5.6-tidy
+      xdebug: php-xdebug
+      xml:
+      - php5.6-xml
+      - php5.6-xmlrpc
+      xsl: php5.6-xsl
+      zip: php5.6-zip
+  modules:
+  - bz2
+  - cli
+  - curl
+  - gd
+  - imagick
+  - imap
+  - intl
+  - mbstring
+  - mysql
+  - readline
+  - redis
+  - xdebug
+  - xml
+  - zip
+  repo:
+    file: /etc/apt/sources.list.d/php-sury.list
+    humanname: php-sury ppa
+    key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c
+    name: deb http://ppa.launchpad.net/ondrej/php/ubuntu xenial main
+  use_external_repo: true
+  version:
+  - '5.6'
+  - '7.3'

test/integration/default/files/_mapdata/ubuntu-18.yaml

@@ -2,12 +2,25 @@
 # Ubuntu-18.04
 ---
 values:
-  php:
-    apache2:
-      ini:
+  apache2:
+    ini:
+      opts: {}
+      settings: {}
+  cli:
+    ini:
+      opts: {}
+      settings:
+        Assertion:
+          zend.assertions: -1
+        Date:
+          date.timezone: Europe/Paris
+        PHP:
+          default_charset: UTF-8
+  fpm:
+    config:
+      conf:
         opts: {}
         settings: {}
-    cli:
       ini:
         opts: {}
         settings:
@@ -16,376 +29,362 @@ values:
           Date:
             date.timezone: Europe/Paris
           PHP:
+            cgi.fix_pathinfo: 0
             default_charset: UTF-8
-    fpm:
-      config:
-        conf:
-          opts: {}
-          settings: {}
-        ini:
-          opts: {}
-          settings:
-            Assertion:
-              zend.assertions: -1
-            Date:
-              date.timezone: Europe/Paris
-            PHP:
-              cgi.fix_pathinfo: 0
-              default_charset: UTF-8
-              expose_php: 'Off'
-      pools:
-        ldap-admin.conf:
-          enabled: true
-          phpversion: '7.3'
-          settings:
-            ldap-admin:
-              catch_workers_output: 'yes'
-              group: www-data
-              listen: /tmp/php-fpm-ldap-admin2.sock
-              listen.mode: '0666'
-              php_admin_value[date.timezone]: Europe/Paris
-              ping.path: /php-ping
-              pm: static
-              pm.max_children: 3
-              pm.max_requests: 500
-              pm.status_path: /php-status
-              security.limit_extensions: .php
-              user: www-data
-        radius-admin.conf:
-          enabled: true
-          phpversion: '5.6'
-          settings:
-            radius-admin:
-              catch_workers_output: 'yes'
-              group: www-data
-              listen: /tmp/php-fpm-radius-admin.sock
-              listen.mode: '0666'
-              php_admin_value[date.timezone]: Europe/Paris
-              ping.path: /php-ping
-              pm: static
-              pm.max_children: 3
-              pm.max_requests: 500
-              pm.status_path: /php-status
-              security.limit_extensions: .php
-              user: www-data
-      service:
+            expose_php: 'Off'
+    pools:
+      ldap-admin.conf:
         enabled: true
-        opts: {}
-    hhvm:
-      config:
-        php:
-          opts: {}
-          settings: {}
-        server:
-          opts: {}
-          settings: {}
-      service:
+        phpversion: '7.3'
+        settings:
+          ldap-admin:
+            catch_workers_output: 'yes'
+            group: www-data
+            listen: /tmp/php-fpm-ldap-admin2.sock
+            listen.mode: '0666'
+            php_admin_value[date.timezone]: Europe/Paris
+            ping.path: /php-ping
+            pm: static
+            pm.max_children: 3
+            pm.max_requests: 500
+            pm.status_path: /php-status
+            security.limit_extensions: .php
+            user: www-data
+      radius-admin.conf:
         enabled: true
+        phpversion: '5.6'
+        settings:
+          radius-admin:
+            catch_workers_output: 'yes'
+            group: www-data
+            listen: /tmp/php-fpm-radius-admin.sock
+            listen.mode: '0666'
+            php_admin_value[date.timezone]: Europe/Paris
+            ping.path: /php-ping
+            pm: static
+            pm.max_children: 3
+            pm.max_requests: 500
+            pm.status_path: /php-status
+            security.limit_extensions: .php
+            user: www-data
+    service:
+      enabled: true
+      opts: {}
+  hhvm:
+    config:
+      php:
         opts: {}
-    ini:
+        settings: {}
+      server:
+        opts: {}
+        settings: {}
+    service:
+      enabled: true
+      opts: {}
+  ini:
+    defaults:
+      CLI Server:
+        cli_server.color: 'On'
+      Date:
+        date.timezone: America/New_York
+      Interbase:
+        ibase.allow_persistent: 1
+        ibase.dateformat: '"%Y-%m-%d"'
+        ibase.max_links: -1
+        ibase.max_persistent: -1
+        ibase.timeformat: '"%H:%M:%S"'
+        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
+      MSSQL:
+        mssql.allow_persistent: 'On'
+        mssql.compatibility_mode: 'Off'
+        mssql.max_links: -1
+        mssql.max_persistent: -1
+        mssql.min_error_severity: 10
+        mssql.min_message_severity: 10
+        mssql.secure_connection: 'Off'
+      MySQL:
+        mysql.allow_local_infile: 'On'
+        mysql.allow_persistent: 'On'
+        mysql.cache_size: '2000'
+        mysql.connect_timeout: 60
+        mysql.max_links: -1
+        mysql.max_persistent: -1
+        mysql.trace_mode: 'Off'
+      MySQLi:
+        mysqli.allow_persistent: 'On'
+        mysqli.cache_size: 2000
+        mysqli.default_port: 3306
+        mysqli.max_links: -1
+        mysqli.max_persistent: -1
+        mysqli.reconnect: 'Off'
+      ODBC:
+        odbc.allow_persistent: 'On'
+        odbc.check_persistent: 'On'
+        odbc.defaultbinmode: 1
+        odbc.defaultlrl: 4096
+        odbc.max_links: '-1'
+        odbc.max_persistent: '-1'
+      PHP:
+        allow_url_fopen: 'On'
+        allow_url_include: 'Off'
+        asp_tags: 'Off'
+        auto_globals_jit: 'On'
+        default_mimetype: '"text/html"'
+        default_socket_timeout: 60
+        disable_functions:
+        - pcntl_alarm
+        - pcntl_fork
+        - pcntl_waitpid
+        - pcntl_wait
+        - pcntl_wifexited
+        - pcntl_wifstopped
+        - pcntl_wifsignaled
+        - pcntl_wexitstatus
+        - pcntl_wtermsig
+        - pcntl_wstopsig
+        - pcntl_signal
+        - pcntl_signal_dispatch
+        - pcntl_get_last_error
+        - pcntl_strerror
+        - pcntl_sigprocmask
+        - pcntl_sigwaitinfo
+        - pcntl_sigtimedwait
+        - pcntl_exec
+        - pcntl_getpriority
+        - pcntl_setpriority
+        display_errors: 'Off'
+        display_startup_errors: 'Off'
+        enable_dl: 'Off'
+        engine: 'On'
+        error_reporting:
+        - E_ALL
+        - ~E_DEPRECATED
+        - ~E_STRICT
+        expose_php: 'On'
+        file_uploads: 'On'
+        html_errors: 'On'
+        ignore_repeated_errors: 'Off'
+        ignore_repeated_source: 'Off'
+        implicit_flush: 'Off'
+        log_errors: 'On'
+        log_errors_max_len: 1024
+        max_execution_time: 30
+        max_file_uploads: 20
+        max_input_nesting_level: 64
+        max_input_time: 60
+        max_input_vars: 1000
+        memory_limit: 128M
+        output_buffering: 4096
+        post_max_size: 8M
+        precision: 14
+        register_argc_argv: 'Off'
+        report_memleaks: 'On'
+        request_order: GP
+        serialize_precision: 17
+        short_open_tag: 'Off'
+        track_errors: 'Off'
+        upload_max_filesize: 2M
+        variables_order: GPCS
+        zend.enable_gc: 'On'
+        zlib.output_compression: 'Off'
+      Pdo_mysql:
+        pdo_mysql.cache_size: 2000
+      PostgreSQL:
+        pgsql.allow_persistent: 'On'
+        pgsql.auto_reset_persistent: 'Off'
+        pgsql.ignore_notice: 0
+        pgsql.log_notice: 0
+        pgsql.max_links: -1
+        pgsql.max_persistent: -1
+      SQL:
+        sql.safe_mode: 'Off'
+      Session:
+        session.auto_start: 0
+        session.bug_compat_42: 'Off'
+        session.bug_compat_warn: 'Off'
+        session.cache_expire: '180'
+        session.cache_limiter: nocache
+        session.cookie_lifetime: 0
+        session.cookie_path: /
+        session.gc_divisor: 1000
+        session.gc_maxlifetime: 1440
+        session.gc_probability: 0
+        session.hash_bits_per_character: 5
+        session.hash_function: 0
+        session.name: PHPSESSID
+        session.save_handler: files
+        session.serialize_handler: php
+        session.use_cookies: 1
+        session.use_only_cookies: 1
+        session.use_strict_mode: 0
+        session.use_trans_sid: 0
+        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
+      Sybase-CT:
+        sybct.allow_persistent: 'On'
+        sybct.max_links: -1
+        sybct.max_persistent: -1
+        sybct.min_client_severity: 10
+        sybct.min_server_severity: 10
+      Tidy:
+        tidy.clean_output: 'Off'
+      bcmath:
+        bcmath.scale: 0
+      ldap:
+        ldap.max_links: -1
+      mail function:
+        SMTP: localhost
+        mail.add_x_header: 'On'
+      mysqlnd:
+        mysqlnd.collect_memory_statistics: 'Off'
+        mysqlnd.collect_statistics: 'On'
+      soap:
+        soap.wsdl_cache_dir: '"/tmp"'
+        soap.wsdl_cache_enabled: 1
+        soap.wsdl_cache_limit: 5
+        soap.wsdl_cache_ttl: 86400
+  lookup:
+    apache2:
+      ini: /etc/php/5.6/apache2/php.ini
+    cli:
+      ini: /etc/php/5.6/cli/php.ini
+    fpm:
+      conf: /etc/php/5.6/fpm/php-fpm.conf
       defaults:
-        CLI Server:
-          cli_server.color: 'On'
-        Date:
-          date.timezone: America/New_York
-        Interbase:
-          ibase.allow_persistent: 1
-          ibase.dateformat: '"%Y-%m-%d"'
-          ibase.max_links: -1
-          ibase.max_persistent: -1
-          ibase.timeformat: '"%H:%M:%S"'
-          ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-        MSSQL:
-          mssql.allow_persistent: 'On'
-          mssql.compatibility_mode: 'Off'
-          mssql.max_links: -1
-          mssql.max_persistent: -1
-          mssql.min_error_severity: 10
-          mssql.min_message_severity: 10
-          mssql.secure_connection: 'Off'
-        MySQL:
-          mysql.allow_local_infile: 'On'
-          mysql.allow_persistent: 'On'
-          mysql.cache_size: '2000'
-          mysql.connect_timeout: 60
-          mysql.max_links: -1
-          mysql.max_persistent: -1
-          mysql.trace_mode: 'Off'
-        MySQLi:
-          mysqli.allow_persistent: 'On'
-          mysqli.cache_size: 2000
-          mysqli.default_port: 3306
-          mysqli.max_links: -1
-          mysqli.max_persistent: -1
-          mysqli.reconnect: 'Off'
-        ODBC:
-          odbc.allow_persistent: 'On'
-          odbc.check_persistent: 'On'
-          odbc.defaultbinmode: 1
-          odbc.defaultlrl: 4096
-          odbc.max_links: '-1'
-          odbc.max_persistent: '-1'
-        PHP:
-          allow_url_fopen: 'On'
-          allow_url_include: 'Off'
-          asp_tags: 'Off'
-          auto_globals_jit: 'On'
-          default_mimetype: '"text/html"'
-          default_socket_timeout: 60
-          disable_functions:
-          - pcntl_alarm
-          - pcntl_fork
-          - pcntl_waitpid
-          - pcntl_wait
-          - pcntl_wifexited
-          - pcntl_wifstopped
-          - pcntl_wifsignaled
-          - pcntl_wexitstatus
-          - pcntl_wtermsig
-          - pcntl_wstopsig
-          - pcntl_signal
-          - pcntl_signal_dispatch
-          - pcntl_get_last_error
-          - pcntl_strerror
-          - pcntl_sigprocmask
-          - pcntl_sigwaitinfo
-          - pcntl_sigtimedwait
-          - pcntl_exec
-          - pcntl_getpriority
-          - pcntl_setpriority
-          display_errors: 'Off'
-          display_startup_errors: 'Off'
-          enable_dl: 'Off'
-          engine: 'On'
-          error_reporting:
-          - E_ALL
-          - ~E_DEPRECATED
-          - ~E_STRICT
-          expose_php: 'On'
-          file_uploads: 'On'
-          html_errors: 'On'
-          ignore_repeated_errors: 'Off'
-          ignore_repeated_source: 'Off'
-          implicit_flush: 'Off'
-          log_errors: 'On'
-          log_errors_max_len: 1024
-          max_execution_time: 30
-          max_file_uploads: 20
-          max_input_nesting_level: 64
-          max_input_time: 60
-          max_input_vars: 1000
-          memory_limit: 128M
-          output_buffering: 4096
-          post_max_size: 8M
-          precision: 14
-          register_argc_argv: 'Off'
-          report_memleaks: 'On'
-          request_order: GP
-          serialize_precision: 17
-          short_open_tag: 'Off'
-          track_errors: 'Off'
-          upload_max_filesize: 2M
-          variables_order: GPCS
-          zend.enable_gc: 'On'
-          zlib.output_compression: 'Off'
-        Pdo_mysql:
-          pdo_mysql.cache_size: 2000
-        PostgreSQL:
-          pgsql.allow_persistent: 'On'
-          pgsql.auto_reset_persistent: 'Off'
-          pgsql.ignore_notice: 0
-          pgsql.log_notice: 0
-          pgsql.max_links: -1
-          pgsql.max_persistent: -1
-        SQL:
-          sql.safe_mode: 'Off'
-        Session:
-          session.auto_start: 0
-          session.bug_compat_42: 'Off'
-          session.bug_compat_warn: 'Off'
-          session.cache_expire: '180'
-          session.cache_limiter: nocache
-          session.cookie_lifetime: 0
-          session.cookie_path: /
-          session.gc_divisor: 1000
-          session.gc_maxlifetime: 1440
-          session.gc_probability: 0
-          session.hash_bits_per_character: 5
-          session.hash_function: 0
-          session.name: PHPSESSID
-          session.save_handler: files
-          session.serialize_handler: php
-          session.use_cookies: 1
-          session.use_only_cookies: 1
-          session.use_strict_mode: 0
-          session.use_trans_sid: 0
-          url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-        Sybase-CT:
-          sybct.allow_persistent: 'On'
-          sybct.max_links: -1
-          sybct.max_persistent: -1
-          sybct.min_client_severity: 10
-          sybct.min_server_severity: 10
-        Tidy:
-          tidy.clean_output: 'Off'
-        bcmath:
-          bcmath.scale: 0
-        ldap:
-          ldap.max_links: -1
-        mail function:
-          SMTP: localhost
-          mail.add_x_header: 'On'
-        mysqlnd:
-          mysqlnd.collect_memory_statistics: 'Off'
-          mysqlnd.collect_statistics: 'On'
-        soap:
-          soap.wsdl_cache_dir: '"/tmp"'
-          soap.wsdl_cache_enabled: 1
-          soap.wsdl_cache_limit: 5
-          soap.wsdl_cache_ttl: 86400
-    lookup:
-      apache2:
-        ini: /etc/php/5.6/apache2/php.ini
-      cli:
-        ini: /etc/php/5.6/cli/php.ini
-      fpm:
-        conf: /etc/php/5.6/fpm/php-fpm.conf
-        defaults:
-          global:
-            error_log: /var/log/php5.6-fpm.log
-            pid: /run/php/php5.6-fpm.pid
-          include: /etc/php/5.6/fpm/pool.d/*.conf
-        group: root
-        ini: /etc/php/5.6/fpm/php.ini
-        pools: /etc/php/5.6/fpm/pool.d
-        service: php5.6-fpm
-        user: root
-      hhvm:
-        conf: /etc/hhvm/server.ini
-        defaults: {}
-        ini: /etc/hhvm/php.ini
-        php:
-          hhvm.log.always_log_unhandled_exceptions: 'true'
-          hhvm.log.level: Warning
-          hhvm.log.runtime_error_reporting_level: '8191'
-          hhvm.mysql.typed_results: 'false'
-          session.gc_maxlifetime: '1440'
-          session.save_handler: files
-          session.save_path: /var/lib/hhvm/sessions
-        server:
-          hhvm.log.file: /var/log/hhvm/error.log
-          hhvm.log.use_log_file: 'true'
-          hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-          hhvm.server.default_document: index.php
-          hhvm.server.port: '9000'
-          hhvm.server.type: fastcgi
-          pid: /var/run/hhvm/pid
-        service: hhvm
-      pkgs:
-        adodb: libphp-adodb
-        apache2: libapache2-mod-php5.6
-        apc: php-apcu
-        apcu: php-apcu-bc
-        auth-sasl: php-auth-sasl
-        bcmath: php5.6-bcmath
-        build_pkgs:
-        - libssl-dev
-        - libcurl4-openssl-dev
-        - pkg-config
-        - libsslcommon2-dev
-        - gcc
-        - make
-        - autoconf
-        - libc-dev
-        - pkg-config
-        bz2: php5.6-bz2
-        cache-lite: php-cache-lite
-        cgi: php5.6-cgi
-        cli: php5.6-cli
-        composer_bin: composer
-        console-table: php-console-table
-        curl: php5.6-curl
-        dba: php5.6-dba
-        dev: php5.6-dev
-        ext_conf_path: /etc/php/5.6/mods-available
-        fpm: php5.6-fpm
-        gd: php5.6-gd
-        gearman: php-gearman
-        geoip: php-geoip
-        geshi: php-geshi
-        gettext: php5.6
-        gmp: php5.6-gmp
-        hhvm: hhvm
-        imagick: php-imagick
-        imap: php5.6-imap
-        intl: php5.6-intl
-        json: php5.6-json
-        ldap: php5.6-ldap
-        local_bin: /usr/local/bin
-        mail: php-mail
-        mbstring: php5.6-mbstring
-        mcrypt: php5.6-mcrypt
-        memcache: php-memcache
-        memcached: php-memcached
-        mongo: php-mongo
-        mongodb: php-mongodb
-        mysql: php5.6-mysql
-        mysqlnd: php5.6-mysql
-        net-smtp: php-net-smtp
-        net4: php-net-ipv4
-        net6: php-net-ipv6
-        oauth: php-oauth
-        odbc: php-odbc
-        opcache: php5.6-opcache
-        pear: php-pear
-        pgsql: php5.6-pgsql
-        php: php5.6
-        phpenmod_command: phpenmod -v5.6
-        pspell: php5.6-pspell
-        readline: php5.6-readline
-        redis: php-redis
-        seclib:
-        - php-phpseclib
-        - php-seclib
-        snmp: php5.6-snmp
-        soap: php5.6-soap
-        sqlite: php5.6-sqlite3
-        ssh2: php-ssh2
-        suhosin5_ext: suhosin.so
-        suhosin5_repo: https://github.com/sektioneins/suhosin
-        suhosin7_ext: suhosin7.so
-        suhosin7_repo: https://github.com/sektioneins/suhosin7
-        sybase: php5.6-sybase
-        tcpdf: php-tcpdf
-        temp_dir: /tmp
-        tidy: php5.6-tidy
-        xdebug: php-xdebug
-        xml:
-        - php5.6-xml
-        - php5.6-xmlrpc
-        xsl: php5.6-xsl
-        zip: php5.6-zip
-    modules:
-    - bz2
-    - cli
-    - curl
-    - gd
-    - imagick
-    - imap
-    - intl
-    - mbstring
-    - mysql
-    - readline
-    - redis
-    - xdebug
-    - xml
-    - zip
-    repo:
-      file: /etc/apt/sources.list.d/php-sury.list
-      humanname: php-sury ppa
-      key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c
-      name: deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main
-    use_external_repo: true
-    version:
-    - '5.6'
-    - '7.3'
+        global:
+          error_log: /var/log/php5.6-fpm.log
+          pid: /run/php/php5.6-fpm.pid
+        include: /etc/php/5.6/fpm/pool.d/*.conf
+      group: root
+      ini: /etc/php/5.6/fpm/php.ini
+      pools: /etc/php/5.6/fpm/pool.d
+      service: php5.6-fpm
+      user: root
+    hhvm:
+      conf: /etc/hhvm/server.ini
+      defaults: {}
+      ini: /etc/hhvm/php.ini
+      php:
+        hhvm.log.always_log_unhandled_exceptions: 'true'
+        hhvm.log.level: Warning
+        hhvm.log.runtime_error_reporting_level: '8191'
+        hhvm.mysql.typed_results: 'false'
+        session.gc_maxlifetime: '1440'
+        session.save_handler: files
+        session.save_path: /var/lib/hhvm/sessions
+      server:
+        hhvm.log.file: /var/log/hhvm/error.log
+        hhvm.log.use_log_file: 'true'
+        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
+        hhvm.server.default_document: index.php
+        hhvm.server.port: '9000'
+        hhvm.server.type: fastcgi
+        pid: /var/run/hhvm/pid
+      service: hhvm
+    pkgs:
+      adodb: libphp-adodb
+      apache2: libapache2-mod-php5.6
+      apc: php-apcu
+      apcu: php-apcu-bc
+      auth-sasl: php-auth-sasl
+      bcmath: php5.6-bcmath
+      build_pkgs:
+      - libssl-dev
+      - libcurl4-openssl-dev
+      - pkg-config
+      - libsslcommon2-dev
+      - gcc
+      - make
+      - autoconf
+      - libc-dev
+      - pkg-config
+      bz2: php5.6-bz2
+      cache-lite: php-cache-lite
+      cgi: php5.6-cgi
+      cli: php5.6-cli
+      composer_bin: composer
+      console-table: php-console-table
+      curl: php5.6-curl
+      dba: php5.6-dba
+      dev: php5.6-dev
+      ext_conf_path: /etc/php/5.6/mods-available
+      fpm: php5.6-fpm
+      gd: php5.6-gd
+      gearman: php-gearman
+      geoip: php-geoip
+      geshi: php-geshi
+      gettext: php5.6
+      gmp: php5.6-gmp
+      hhvm: hhvm
+      imagick: php-imagick
+      imap: php5.6-imap
+      intl: php5.6-intl
+      json: php5.6-json
+      ldap: php5.6-ldap
+      local_bin: /usr/local/bin
+      mail: php-mail
+      mbstring: php5.6-mbstring
+      mcrypt: php5.6-mcrypt
+      memcache: php-memcache
+      memcached: php-memcached
+      mongo: php-mongo
+      mongodb: php-mongodb
+      mysql: php5.6-mysql
+      mysqlnd: php5.6-mysql
+      net-smtp: php-net-smtp
+      net4: php-net-ipv4
+      net6: php-net-ipv6
+      oauth: php-oauth
+      odbc: php-odbc
+      opcache: php5.6-opcache
+      pear: php-pear
+      pgsql: php5.6-pgsql
+      php: php5.6
+      phpenmod_command: phpenmod -v5.6
+      pspell: php5.6-pspell
+      readline: php5.6-readline
+      redis: php-redis
+      seclib:
+      - php-phpseclib
+      - php-seclib
+      snmp: php5.6-snmp
+      soap: php5.6-soap
+      sqlite: php5.6-sqlite3
+      ssh2: php-ssh2
+      suhosin5_ext: suhosin.so
+      suhosin5_repo: https://github.com/sektioneins/suhosin
+      suhosin7_ext: suhosin7.so
+      suhosin7_repo: https://github.com/sektioneins/suhosin7
+      sybase: php5.6-sybase
+      tcpdf: php-tcpdf
+      temp_dir: /tmp
+      tidy: php5.6-tidy
+      xdebug: php-xdebug
+      xml:
+      - php5.6-xml
+      - php5.6-xmlrpc
+      xsl: php5.6-xsl
+      zip: php5.6-zip
+  modules:
+  - bz2
+  - cli
+  - curl
+  - gd
+  - imagick
+  - imap
+  - intl
+  - mbstring
+  - mysql
+  - readline
+  - redis
+  - xdebug
+  - xml
+  - zip
+  repo:
+    file: /etc/apt/sources.list.d/php-sury.list
+    humanname: php-sury ppa
+    key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c
+    name: deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main
+  use_external_repo: true
+  version:
+  - '5.6'
+  - '7.3'