Re: [Launchpad-reviewers] [Merge] ~pelpsi/launchpad:ftpmaster-publisher-configuration into launchpad:master
Diff comments: > diff --git a/charm/launchpad-ftpmaster-publisher/config.yaml > b/charm/launchpad-ftpmaster-publisher/config.yaml > index d871574..b33716b 100644 > --- a/charm/launchpad-ftpmaster-publisher/config.yaml > +++ b/charm/launchpad-ftpmaster-publisher/config.yaml > @@ -7,6 +7,18 @@ options: > type: string > description: Domain name for the published Ubuntu archive. > default: "archive.ubuntu.test" > + ftp_auth_users: Here I differentiated auth_users for the [ftp] entry and [partner]. I don't know if it makes sense but they may have different configurations. Same for hosts_allow. > +type: string > +description: Authenticated users for rsync ubuntu > +default: "" > + ftp_secrets: > +type: string > +description: Path for rsync secrets > +default: "" > + partner_auth_users: > +type: string > +description: Authenticated users for rsync ubuntu-partner > +default: "" >signing_client_public_key: > type: string > description: Public key for encrypting communication between client and > signing service. -- https://code.launchpad.net/~pelpsi/launchpad/+git/launchpad/+merge/453838 Your team Launchpad code reviewers is requested to review the proposed merge of ~pelpsi/launchpad:ftpmaster-publisher-configuration into launchpad:master. ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
[Launchpad-reviewers] [Merge] ~pelpsi/launchpad:ftpmaster-publisher-configuration into launchpad:master
Simone Pelosi has proposed merging
~pelpsi/launchpad:ftpmaster-publisher-configuration into launchpad:master.
Commit message:
Added rsync configuration to ftpmaster publisher
According to the legacy deployment of the publisher
we added a configuration file to configure correctly rsync
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~pelpsi/launchpad/+git/launchpad/+merge/453838
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~pelpsi/launchpad:ftpmaster-publisher-configuration into launchpad:master.
diff --git a/charm/launchpad-ftpmaster-publisher/config.yaml b/charm/launchpad-ftpmaster-publisher/config.yaml
index d871574..b33716b 100644
--- a/charm/launchpad-ftpmaster-publisher/config.yaml
+++ b/charm/launchpad-ftpmaster-publisher/config.yaml
@@ -7,6 +7,18 @@ options:
type: string
description: Domain name for the published Ubuntu archive.
default: "archive.ubuntu.test"
+ ftp_auth_users:
+type: string
+description: Authenticated users for rsync ubuntu
+default: ""
+ ftp_secrets:
+type: string
+description: Path for rsync secrets
+default: ""
+ partner_auth_users:
+type: string
+description: Authenticated users for rsync ubuntu-partner
+default: ""
signing_client_public_key:
type: string
description: Public key for encrypting communication between client and signing service.
@@ -23,3 +35,11 @@ options:
type: string
description: Webmaster contact address.
default: "webmas...@launchpad.test"
+ ubuntu_dists_hosts_allow:
+type: string
+description: IP addresses permitted to connect to ubuntu/dists.
+default: ""
+ ubuntu_germinate_hosts_allow:
+type: string
+description: IP addresses permitted to connect to ubuntu-germinate.
+default: ""
\ No newline at end of file
diff --git a/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py b/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py
index 0342c89..eb1a447 100644
--- a/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py
+++ b/charm/launchpad-ftpmaster-publisher/reactive/launchpad-ftpmaster-publisher.py
@@ -57,6 +57,12 @@ def configure():
"launchpad-ftpmaster-publisher-secrets-lazr.conf",
secret=True,
)
+templating.render(
+"publisher.conf.j2",
+"/etc/rsync-juju.d/publisher.conf",
+config,
+perms=0o644,
+)
configure_email(config, "launchpad-ftpmaster-publisher")
configure_logrotate(config)
configure_cron(config, "crontab.j2")
diff --git a/charm/launchpad-ftpmaster-publisher/templates/publisher.conf.j2 b/charm/launchpad-ftpmaster-publisher/templates/publisher.conf.j2
new file mode 100644
index 000..e5d5f9a
--- /dev/null
+++ b/charm/launchpad-ftpmaster-publisher/templates/publisher.conf.j2
@@ -0,0 +1,32 @@
+max connections = 25
+
+[ftp]
+ path = {{ archives_dir }}/ubuntu-archive/ubuntu
+ comment = Ubuntu Archive
+ list = false
+ read only = true
+ auth users = {{ ftp_auth_users }}
+ secrets file = {{ ftp_secrets }}
+
+[partner]
+ path = {{ archives_dir }}/ubuntu-archive/ubuntu-partner/
+ comment = Partner
+ list = false
+ read only = true
+ auth users = {{ partner_auth_users }}
+ secrets file = {{ ftp_secrets }}
+
+[ubuntu-dists]
+ path = {{ archives_dir }}/ubuntu-archive/ubuntu/dists
+ comment = Ubuntu Archive Dists
+ list = false
+ read only = true
+ hosts allow = {{ ubuntu_dists_hosts_allow }}
+
+[ubuntu-germinate]
+ path = {{ archives_dir }}/ubuntu-archive/ubuntu-germinate
+ comment = Ubuntu Archive Germinate output
+ list = false
+ read only = true
+ hosts allow = {{ ubuntu_germinate_hosts_allow }}
+
___
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
[Launchpad-reviewers] [Merge] ~cjwatson/launchpad:charm-fix-tour into launchpad:master
Colin Watson has proposed merging ~cjwatson/launchpad:charm-fix-tour into launchpad:master. Commit message: charm: Send +tour requests to appserver, not assets Requested reviews: Launchpad code reviewers (launchpad-reviewers) Related bugs: Bug #2039479 in Launchpad itself: "Broken ‘Take the tour’ links across Launchpad" https://bugs.launchpad.net/launchpad/+bug/2039479 For more details, see: https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/453823 The assets charm doesn't serve anything under this path, and as far as I can see the pre-charm frontends never treated these requests as ones for assets; this was just a migration error. -- Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-fix-tour into launchpad:master. diff --git a/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2 b/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2 index 9b9598d..16708c2 100644 --- a/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2 +++ b/charm/launchpad-appserver/templates/vhosts/mainsite-https.conf.j2 @@ -49,7 +49,7 @@ RewriteRule ^/(\+apidoc.*)$ balancer://cached-launchpad-assets/$1 [P,L] RewriteRule ^/(\+combo/.*)$ balancer://cached-launchpad-assets/$1 [P,L] RewriteRule ^/(\+icing/.*)$ balancer://cached-launchpad-assets/$1 [P,L] -RewriteRule ^/(\+tour.*)$ balancer://cached-launchpad-assets/$1 [P,L] +RewriteRule ^/(\+tour.*)$ balancer://cached-launchpad-appserver-main/$1 [P,L] RewriteRule ^/(@@/.*)$ balancer://cached-launchpad-assets/$1 [P,L] RewriteRule ^/(favicon\.(?:ico|gif|png))$ balancer://cached-launchpad-assets/$1 [P,L] ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
[Launchpad-reviewers] [Merge] ~pelpsi/launchpad:ftpmaster-publisher-403-error into launchpad:master
Simone Pelosi has proposed merging
~pelpsi/launchpad:ftpmaster-publisher-403-error into launchpad:master.
Commit message:
Fixed wrong archive dir
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~pelpsi/launchpad/+git/launchpad/+merge/453808
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~pelpsi/launchpad:ftpmaster-publisher-403-error into launchpad:master.
diff --git a/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2 b/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2
index 5206c4a..169ff83 100644
--- a/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2
+++ b/charm/launchpad-ftpmaster-publisher/templates/vhost.conf.j2
@@ -1,13 +1,13 @@
ServerName {{ domain_ftpmaster }}
-DocumentRoot {{ archives_dir }}/
+DocumentRoot {{ archives_dir }}/ubuntu-archive/
CustomLog /var/log/apache2/{{ domain_ftpmaster }}-access.log combined
ErrorLog /var/log/apache2/{{ domain_ftpmaster }}-error.log
{% for distribution in ("ubuntu", "ubuntu-partner") %}
-
+
IndexOptions NameWidth=* +SuppressDescription
Options +Indexes +FollowSymLinks
IndexIgnore favicon.ico
___
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
[Launchpad-reviewers] [Merge] ~cjwatson/launchpad:lazr.restful-2.0.2 into launchpad:master
Colin Watson has proposed merging ~cjwatson/launchpad:lazr.restful-2.0.2 into
launchpad:master.
Commit message:
Upgrade to lazr.restful 2.0.2
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
Related bugs:
Bug #2039251 in Launchpad itself: "Launchpad API randomly returns empty
responses"
https://bugs.launchpad.net/launchpad/+bug/2039251
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/453777
This removes superfluous HTTP headers from 304 responses that caused caching
problems.
Dependencies MP:
https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/453774
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~cjwatson/launchpad:lazr.restful-2.0.2 into launchpad:master.
diff --git a/lib/lp/services/webservice/stories/conditional-write.rst b/lib/lp/services/webservice/stories/conditional-write.rst
index 6e25c81..0376317 100644
--- a/lib/lp/services/webservice/stories/conditional-write.rst
+++ b/lib/lp/services/webservice/stories/conditional-write.rst
@@ -123,7 +123,10 @@ modified by mod_compress as though it were the original ETag.
>>> headers = {"If-None-Match": etag}
>>> print(webservice.get(url, headers=headers))
HTTP/1.1 304 Not Modified
-...
+Etag: "..."
+Vary: Accept
+
+
Some versions of mod_compress turn '"foo"' into '"foo"-gzip', and some
versions turn it into '"foo-gzip"'. We treat all three forms the same.
@@ -131,12 +134,18 @@ versions turn it into '"foo-gzip"'. We treat all three forms the same.
>>> headers = {"If-None-Match": etag + "-gzip"}
>>> print(webservice.get(url, headers=headers))
HTTP/1.1 304 Not Modified
-...
+Etag: "..."
+Vary: Accept
+
+
>>> headers = {"If-None-Match": etag[:-1] + "-gzip" + etag[-1]}
>>> print(webservice.get(url, headers=headers))
HTTP/1.1 304 Not Modified
-...
+Etag: "..."
+Vary: Accept
+
+
Any other modification to the ETag is treated as a distinct ETag.
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 78fb87c..4f2ba94 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -81,7 +81,7 @@ lazr.delegates==2.0.4
lazr.enum==1.2.1
lazr.jobrunner==0.17
lazr.lifecycle==1.2.1
-lazr.restful==2.0.1
+lazr.restful==2.0.2
lazr.restfulclient==0.14.5
lazr.sshserver==0.1.13
lazr.uri==1.0.6
___
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
[Launchpad-reviewers] [Merge] ~cjwatson/lp-source-dependencies:lazr.restful-2.0.2 into lp-source-dependencies:master
Colin Watson has proposed merging ~cjwatson/lp-source-dependencies:lazr.restful-2.0.2 into lp-source-dependencies:master. Commit message: Add lazr.restful 2.0.2 Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/453774 -- Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-source-dependencies:lazr.restful-2.0.2 into lp-source-dependencies:master. diff --git a/dist/lazr.restful-2.0.2.tar.gz b/dist/lazr.restful-2.0.2.tar.gz new file mode 100644 index 000..60b3ce0 Binary files /dev/null and b/dist/lazr.restful-2.0.2.tar.gz differ ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
