launchpad-reviewers team mailing list archive

[Ines Almeida <mp+449266@xxxxxxxxxxxxxxxxxx>]

Diff comments:

> diff --git a/charm/launchpad-ftpmaster-publisher/templates/launchpad-ftpmaster-publisher-lazr.conf.j2 b/charm/launchpad-ftpmaster-publisher/templates/launchpad-ftpmaster-publisher-lazr.conf.j2
> index 2eb43c9..35dfef2 100644
> --- a/charm/launchpad-ftpmaster-publisher/templates/launchpad-ftpmaster-publisher-lazr.conf.j2
> +++ b/charm/launchpad-ftpmaster-publisher/templates/launchpad-ftpmaster-publisher-lazr.conf.j2
> @@ -10,6 +10,7 @@
>  extends: ../launchpad-db-lazr.conf
>  
>  [archivepublisher]
> +archives_dir: {{ archives_dir }}

I can't find a mention of this being mentioned anywhere in the existing code base, why add it in this conf file?

>  run_parts_location: {{ run_parts_location }}
>  
>  [signing]
> diff --git a/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2 b/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2
> new file mode 100644
> index 0000000..5206c4a
> --- /dev/null
> +++ b/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2
> @@ -0,0 +1,19 @@
> +<VirtualHost *:80>
> +    ServerName {{ domain_ftpmaster }}
> +
> +    DocumentRoot {{ archives_dir }}/
> +
> +    CustomLog /var/log/apache2/{{ domain_ftpmaster }}-access.log combined

Is there a reason why we wouldn't ensure the logs go to a dir such as `/srv/launchpad/logs`? Is it because the apache user doesn't have access to it?

> +    ErrorLog /var/log/apache2/{{ domain_ftpmaster }}-error.log
> +
> +{% for distribution in ("ubuntu", "ubuntu-partner") %}
> +    <Directory "{{ archives_dir }}/{{ distribution }}/">
> +        IndexOptions NameWidth=* +SuppressDescription
> +        Options +Indexes +FollowSymLinks
> +        IndexIgnore favicon.ico
> +        AllowOverride None
> +        Require all granted
> +    </Directory>
> +{% endfor %}
> +</VirtualHost>
> +


-- 
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/449266
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-ftpmaster-apache-website into launchpad:master.