nagios-charmers team mailing list archive

[Giuseppe Petralia <giuseppe.petralia@xxxxxxxxxxxxx>]

Some inline replies. Thanks Paul

Diff comments:

> diff --git a/hooks/upgrade_charm.py b/hooks/upgrade_charm.py
> index bbbb8ac..5b21c1c 100755
> --- a/hooks/upgrade_charm.py
> +++ b/hooks/upgrade_charm.py
> @@ -360,6 +460,23 @@ def update_cgi_config():
>  # note: i tried to use cheetah, and it barfed, several times. It can go play
>  # in a fire. I'm jusing jinja2.
>  def update_apache():
> +    """

SSL and multiple admin emails were added to this MR when we found that master lost some updates that were already merged to master and was broken.

> +    Nagios3 is deployed as a global apache application from the archive.
> +    We'll get a little funky and add the SSL keys to the default-ssl config
> +    which sets our keys, including the self-signed ones, as the host keyfiles.
> +    """
> +
> +    # Start by Setting the ports.conf
> +
> +    with open('hooks/templates/ports-cfg.jinja2', 'r') as f:
> +        templateDef = f.read()

Linting is all broken in all charm. I recommend fixing this on a separate MR

> +    t = Template(templateDef)
> +    ports_conf = '/etc/apache2/ports.conf'
> +
> +    with open(ports_conf, 'w') as f:
> +        f.write(t.render({'enable_http': HTTP_ENABLED}))
> +
> +    # Next setup the default-ssl.conf
>      if os.path.exists(chain_file) and os.path.getsize(chain_file) > 0:
>          ssl_chain = chain_file
>      else:


-- 
https://code.launchpad.net/~peppepetra86/charm-nagios/+git/charm-nagios/+merge/388119
Your team Nagios Charm developers is subscribed to branch charm-nagios:master.