瀏覽代碼

Merge pull request #34 from aboe76/opensuse_support

Added opensuse support
tags/v0.34.0
Forrest 9 年之前
父節點
當前提交
3fe85ca0b4
共有 3 個文件被更改,包括 91 次插入4 次删除
  1. +18
    -0
      README.rst
  2. +31
    -2
      php/map.jinja
  3. +42
    -2
      php/ng/map.jinja

+ 18
- 0
README.rst 查看文件

@@ -24,6 +24,7 @@ Installs the php package.
-----------

Installs the php-apc package.
Disabled by default on opensuse need server:php repo

``php.adodb``
-------------
@@ -34,6 +35,7 @@ Installs the php-adodb package.
-----------

Installs the php-cgi package.
Disabled on opensuse not available, only fastcgi

``php.cli``
-----------
@@ -72,6 +74,7 @@ Installs the php-intl package.
---------------

Installs the php-imagick package.
Disabled on opensuse not available.

``php.imap``
------------
@@ -103,11 +106,13 @@ Installs the php-mcrypt package.
----------------

Installs the php-memcache package.
Disabled on opensuse need server:php:extensions repo

``php.memcached``
-----------------

Installs the php-memcached package.
Disabled on opensuse need server:php:extensions repo

``php.mysql``
-------------
@@ -118,6 +123,7 @@ Installs the php-mysql package.
---------------

Installs the php-mysqlnd package.
Disabled on opensuse no package.

``php.pear``
------------
@@ -128,6 +134,7 @@ Installs the php-pear package.
------------

Installs the php-redis package.
Disabled on opensuse need server:php:extensions repo

``php.pgsql``
-------------
@@ -153,6 +160,7 @@ Installs the php-suhosin package.
-------------

Installs the php-mongo package.
Disabled on opensuse need server:php:extensions repo

``php.xml``
-----------
@@ -186,11 +194,13 @@ Installs the php-adodb package.
--------------

Installs the php-apc package.
Disabled on opensuse need server:php repo

``php.ng.cgi``
--------------

Installs the php-cgi package.
Disabled on opensuse only php5-fastcgi available.

``php.ng.cli``
--------------
@@ -258,6 +268,7 @@ Installs the php-gd package.
------------------

Installs the php-imagick package.
Disabled on opensuse no package.

``php.ng.imap``
---------------
@@ -294,11 +305,15 @@ Installs the php-mcrypt package.
-------------------

Installs the php-memcache package.
Disabled on opensuse need server:php:extensions repo


``php.ng.memcached``
--------------------

Installs the php-memcached package.
Disabled on opensuse need server:php:extensions repo


``php.ng.mysql``
----------------
@@ -309,6 +324,7 @@ Installs the php-mysql package.
------------------

Installs the php-mysqlnd package.
Disabled on opensuse no package.

``php.ng.pear``
---------------
@@ -319,6 +335,8 @@ Installs the php-pear package.
---------------

Installs the php-redis package.
Disabled on opensuse need server:php:extensions repo


``php.ng.pgsql``
----------------

+ 31
- 2
php/map.jinja 查看文件

@@ -17,7 +17,7 @@
'mysqlnd_pkg': 'php5-mysqlnd',
'pear_pkg': 'php-pear',
'soap_pkg': 'php-soap',
'sqlite_pkg': 'php5-sqlite',
'sqlite_pkg': 'php5-sqlite',
'redis_pkg': 'php5-redis',
'fpm_service': 'php5-fpm',
'xml_pkg': 'php5-xml',
@@ -53,7 +53,7 @@
'mysqlnd_pkg': 'php-mysqlnd',
'pear_pkg': 'php-pear',
'soap_pkg': 'php-soap',
'sqlite_pkg': 'php5-sqlite',
'sqlite_pkg': 'php5-sqlite',
'redis_pkg': 'php-redis',
'fpm_service': 'php-fpm',
'xml_pkg': 'php-xml',
@@ -71,4 +71,33 @@
'local_bin': '/usr/local/bin',
'temp_dir': '/tmp',
},
'Suse': {
'php_pkg': 'php5',
'cli_pkg': 'php5-cli',
'curl_pkg': 'php5-curl',
'fpm_pkg': 'php5-fpm',
'gd_pkg': 'php5-gd',
'intl_pkg': 'php5-intl',
'json_pkg': 'php5-json',
'mbstring_pkg': 'php5-mbstring',
'mcrypt_pkg': 'php5-mcrypt',
'mysql_pkg': 'php5-mysql',
'pear_pkg': 'php5-pear',
'soap_pkg': 'php5-soap',
'sqlite_pkg': 'php5-sqlite',
'fpm_service': 'php5-fpm',
'xml_pkg': ['php5-xmlreader','php5-xmlwriter','php5-xmlrpc'],
'suhosin_pkg': 'php5-suhosin',
'imap_pkg': 'php5-imap',
'adodb_pkg': 'php5-dba',
'pgsql_pkg': 'php5-pgsql',
'ldap_pkg': 'php5-ldap',
'php_ini': '/etc/php5/apache2/php.ini',
'dev_pkg': 'php5-devel',
'mongo_pecl': 'mongo',
'mongo_ext': 'mongo.so',
'ext_conf_path': '/etc/php5/conf.d',
'local_bin': '/usr/local/bin',
'temp_dir': '/tmp',
},
}, merge=salt['pillar.get']('php:lookup')) %}

+ 42
- 2
php/ng/map.jinja 查看文件

@@ -19,7 +19,7 @@
'mysqlnd': 'php5-mysqlnd',
'pear': 'php-pear',
'soap': 'php-soap',
'sqlite': 'php5-sqlite',
'sqlite': 'php5-sqlite',
'xml': 'php5-xmlrpc',
'redis': 'php5-redis',
'imagick': 'php5-imagick',
@@ -68,7 +68,7 @@
'mysqlnd': 'php-mysqlnd',
'pear': 'php-pear',
'soap': 'php-soap',
'sqlite': 'php5-sqlite',
'sqlite': 'php5-sqlite',
'xml': 'php-xml',
'redis': 'php-redis',
'imagick': 'php-imagick',
@@ -96,6 +96,46 @@
'ini': '/etc/php.ini',
},
},
'Suse': {
'pkgs': {
'php': 'php5',
'apache2': 'apache2-mod_php5',
'cli': 'php5',
'curl': 'php5-curl',
'fpm': 'php5-fpm',
'gd': 'php5-gd',
'intl': 'php5-intl',
'mbstring': 'php5-mbstring',
'mcrypt': 'php5-mcrypt',
'mysql': 'php5-mysql',
'pear': 'php5-pear',
'soap': 'php5-soap',
'sqlite': 'php5-sqlite',
'xml': ['php5-xmlreader','php5-xmlwriter','php5-xmlrpc'],
'suhosin': 'php5-suhosin',
'imap': 'php5-imap',
'adodb': 'php5-dba',
'pgsql': 'php5-pgsql',
'ldap': 'php5-ldap',
'json': 'php5-json',
},
'fpm': {
'conf': '/etc/php-fpm.conf',
'ini': '/etc/php.ini',
'pools': '/etc/php-fpm.d',
'service': 'php-fpm',
'defaults': {
'global': {
'pid': '/var/run/php-fpm/php-fpm.pid',
'error_log': '/var/log/php-fpm/error.log',
'include': '/etc/php-fpm.d/*.conf',
},
},
},
'cli': {
'ini': '/etc/php.ini',
},
},
}),
'fpm': {
'service': {

Loading…
取消
儲存