remove ng stuff

[k-hamza]

Changes

• remove "-ng" stuff
• correction in listen directive when vhost is disabled

• Tested on rhel7

[alxwr]

@k-hamza I really like what you did here. :-)
(The change request is only for that one hardcoded path.)

I'll test the dev branch in a small setup I'm going to build in a few days.

[alxwr]

@aboe76 @javierbertoli I'd merge this PR as-is, but do we want to add another PR which implements the TOFS pattern?

• Feature/template override and files switch template-formula#19
• Establish template-formula as the go-to resource for all formula development template-formula#21
  Ctrl+F "TOFS pattern vs. pillar"

[myii]

@alxwr Let's finalise the portable TOFS implementation in saltstack-formulas/systemd-formula#27. This should lead to a drop-in solution using libtofs.jinja.

[aboe76]

@k-hamza nice work, are there any deprecations?

[k-hamza]

@aboe76 still some work to do, but at the end it shoudn't have deprecations (if i didn't miss something)

for now it supports only rhel7/httpd 2.4

to support other systems :

• rhel / httpd 2.2 : must add file apache/defaults/Redhat/defaults-apache-2.2.yaml
• Debian :
  • add file apache/defaults/Debian/defaults-apache-2.2.yaml
  • add file apache/defaults/Debian/defaults-apache-2.4.yaml
  • adapt apache/conf.sls to manage specific conf files to this Os
• Suse :
  • add file apache/defaults/Suse/defaults-apache-2.2.yaml
  • add file apache/defaults/Suse/defaults-apache-2.4.yaml
  • adapt apache/conf.sls to manage specific conf files to this Os

... same for other systems

i think there is a discussion to have about config.sls :
may be split it this way :
config.sls contains common code and at the end include config-{{ grains['os_family'] }} that will manage specific system conf files :
config-RedHat.sls
config-Debian.sls
config-Suse.sls
...

And about init.sls :
put the content of init.sls in a new file pkg.sls or install.sls
init.sls may contains only some includes

should these adaptations be added in this PR or in another after the merge of this one ?
i am not familiar with other systems, so it may take me some time to achieve that. if you can help i wouldn't say no :-)

[aboe76]

@k-hamza I have thought about it, sorry it took some time:

Would love to see suppport for other OSes in a different PR,

Splitting the config.sls, you could create a folder config
in which you can have init.sls (for common stuff) and include
RedHat.sls, Suse.sls, Debian.sls for each OS.

Leave the main init.sls as is for now maybe in a later PR this can be refactored.

By the way, I'm merging the current PR in the develop branch.

[k-hamza]

ok for config folder, (need some time to learn about the specificities of other systems)
And thanks for the merge !