search

saltstack-formulas / php-formula

http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html
Other
57 stars 231 forks source link

Add support for Ubuntu Xenial Xerus (16.04). Fixes #97 #98

Closed alinefr closed 8 years ago

alinefr commented 8 years ago

Ubuntu Xenial brings php7.0, but also it brings generic php packages named:

php
php-cli
php-gd
php-curl

... and so on.

So I've added a conditional in map.jinja (including the ng one) to filter Ubuntu version greater than 16.04. I've tried my best to not break older Ubuntu versions or other OSs.

gravyboat commented 8 years ago

From a quick check this looks fine to me and it seems to be backwards compatible (at least for the basic map.jinja). I'm going to leave this open to see if anyone else wants to weigh in, if they don't within a day or two please ping me and I'll get this merged.

wwentland commented 8 years ago

This branch has conflicts now, a rebase and force push would be great!

alinefr commented 8 years ago

Done!

gravyboat commented 8 years ago

Taking @babilen's comment as a sign off so I will merge this in. Thanks!

aboe76 commented 8 years ago

This breaks Archlinux support, php.ng.map.jinja the whole 'Arch' stuff has been removed.

aboe76 commented 8 years ago

fixed it with #101

gravyboat commented 8 years ago

Thanks @aboe76.

alinefr commented 8 years ago

Sorry for that. Glad you already fixed it.