Merge pull request voxpupuli#359 from bastelfreak/archlinux2

add initial archlinux support
remisauvat · Jun 29, 2017 · dc9e9cc · dc9e9cc
2 parents 171bf45 + d6674a1
commit dc9e9cc
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 0 deletions.
diff --git a/manifests/globals.pp b/manifests/globals.pp
@@ -111,6 +111,10 @@
       $default_config_root  = '/usr/local/etc'
       $default_fpm_pid_file = '/var/run/php-fpm.pid'
     }
+    'Archlinux': {
+      $default_config_root  =  '/etc/php'
+      $default_fpm_pid_file = '/run/php-fpm/php-fpm.pid'
+    }
     default: {
       fail("Unsupported osfamily: ${facts['os']['family']}")
     }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -157,6 +157,33 @@
       $ext_tool_query          = undef
       $ext_tool_enabled        = false
     }
+    'Archlinux': {
+      $config_root_ini         = '/etc/php/conf.d'
+      $config_root_inifile     = '/etc/php/php.ini'
+      $common_package_names    = []
+      $common_package_suffixes = ['cli', 'common']
+      $cli_inifile             = '/etc/php/php.ini'
+      $dev_package_suffix      = undef
+      $fpm_pid_file            = '/run/php-fpm/php-fpm.pid'
+      $fpm_config_file         = '/etc/php/php-fpm.conf'
+      $fpm_error_log           = '/var/log/php-fpm/error.log'
+      $fpm_inifile             = '/etc/php/php.ini'
+      $fpm_package_suffix      = 'fpm'
+      $fpm_pool_dir            = '/etc/php/php-fpm.d'
+      $fpm_service_name        = 'php-fpm'
+      $fpm_user                = 'root'
+      $fpm_group               = 'root'
+      $apache_inifile          = '/etc/php/php.ini'
+      $embedded_package_suffix = 'embedded'
+      $embedded_inifile        = '/etc/php/php.ini'
+      $package_prefix          = 'php-'
+      $compiler_packages       = ['gcc', 'make']
+      $manage_repos            = false
+      $root_group              = 'root'
+      $ext_tool_enable         = undef
+      $ext_tool_query          = undef
+      $ext_tool_enabled        = false
+    }
     default: {
       fail("Unsupported osfamily: ${facts['os']['family']}")
     }

diff --git a/metadata.json b/metadata.json
@@ -80,6 +80,9 @@
     },
     {
       "operatingsystem": "OpenSUSE"
+    },
+    {
+      "operatingsystem": "Archlinux"
     }
   ]
 }
diff --git a/spec/classes/php_spec.rb b/spec/classes/php_spec.rb
@@ -60,6 +60,8 @@
         dstfile = case facts[:osfamily]
                   when 'Debian'
                     '/etc/php5/fpm/pool.d/www.conf'
+                  when 'Archlinux'
+                    '/etc/php/php-fpm.d/www.conf'
                   when 'Suse'
                     '/etc/php5/fpm/pool.d/www.conf'
                   when 'RedHat'
@@ -78,6 +80,8 @@
         dstfile = case facts[:osfamily]
                   when 'Debian'
                     '/etc/php5/fpm/pool.d/www.conf'
+                  when 'Archlinux'
+                    '/etc/php/php-fpm.d/www.conf'
                   when 'Suse'
                     '/etc/php5/fpm/pool.d/www.conf'
                   when 'RedHat'

diff --git a/spec/defines/extension_spec.rb b/spec/defines/extension_spec.rb
@@ -13,6 +13,8 @@
         etcdir = case facts[:osfamily]
                  when 'Debian'
                    '/etc/php5/mods-available'
+                 when 'Archlinux'
+                   '/etc/php/conf.d'
                  else
                    '/etc/php.d'
                  end
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,9 @@ @@
         },
         {
           "operatingsystem": "OpenSUSE"
+        },
+        {
+          "operatingsystem": "Archlinux"
         }
       ]
     }