Colin Watson has proposed merging
~cjwatson/launchpad:charm-update-launchpad-layers into launchpad:master.
Commit message:
charm: Update launchpad-layers to 1920a6f823
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/439752
This pulls in "Add many missing entries to launchpad-base-lazr.conf" (making
one line in `charm/launchpad-appserver/templates/launchpad-appserver-lazr.conf`
redundant) and "Change the launchpad user's shell to /bin/bash".
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~cjwatson/launchpad:charm-update-launchpad-layers into launchpad:master.
diff --git a/charm/launchpad-admin/charmcraft.yaml b/charm/launchpad-admin/charmcraft.yaml
index 7e58370..9d6d318 100644
--- a/charm/launchpad-admin/charmcraft.yaml
+++ b/charm/launchpad-admin/charmcraft.yaml
@@ -35,7 +35,7 @@ parts:
after:
- ols-layers
source: https://git.launchpad.net/launchpad-layers
- source-commit: "ead45e3e5f7bbf21e81de102ffee6f98cbbfd317"
+ source-commit: "1920a6f823d8d882a99662bdda55f67f37359850"
source-submodules: []
source-type: git
plugin: dump
diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
index aa99dd3..b35779b 100644
--- a/charm/launchpad-appserver/charmcraft.yaml
+++ b/charm/launchpad-appserver/charmcraft.yaml
@@ -35,7 +35,7 @@ parts:
after:
- ols-layers
source: https://git.launchpad.net/launchpad-layers
- source-commit: "ead45e3e5f7bbf21e81de102ffee6f98cbbfd317"
+ source-commit: "1920a6f823d8d882a99662bdda55f67f37359850"
source-submodules: []
source-type: git
plugin: dump
diff --git a/charm/launchpad-appserver/templates/launchpad-appserver-lazr.conf b/charm/launchpad-appserver/templates/launchpad-appserver-lazr.conf
index b549f1a..a7e2c95 100644
--- a/charm/launchpad-appserver/templates/launchpad-appserver-lazr.conf
+++ b/charm/launchpad-appserver/templates/launchpad-appserver-lazr.conf
@@ -22,7 +22,6 @@ devmode: {{ devmode }}
[launchpad_session]
database: {{ db_session }}
dbuser: {{ db_session_user }}
-cookie: {{ session_cookie_name }}
[mailman]
{{- opt("archive_url_template", mailman_archive_url_template) }}
diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
index 7980d0e..34e0ad5 100644
--- a/charm/launchpad/charmcraft.yaml
+++ b/charm/launchpad/charmcraft.yaml
@@ -35,7 +35,7 @@ parts:
after:
- ols-layers
source: https://git.launchpad.net/launchpad-layers
- source-commit: "ead45e3e5f7bbf21e81de102ffee6f98cbbfd317"
+ source-commit: "1920a6f823d8d882a99662bdda55f67f37359850"
source-submodules: []
source-type: git
plugin: dump
_______________________________________________
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
