Merge lp://staging/~brad-marshall/charms/precise/python-moinmoin/python-rewrite-with-openid-fixes into lp://staging/charms/python-moinmoin
Proposed by
Brad Marshall
| Status: | Merged |
|---|---|
| Merged at revision: | 8 |
| Proposed branch: | lp://staging/~brad-marshall/charms/precise/python-moinmoin/python-rewrite-with-openid-fixes |
| Merge into: | lp://staging/charms/python-moinmoin |
| Diff against target: |
14878 lines (+13568/-295) 115 files modified
README.md (+0/-62) config.yaml (+0/-30) copyright (+0/-17) files/openidrp.py (+325/-0) files/openidrp_teams.py (+157/-0) files/teams.py (+398/-0) hooks/config-changed (+0/-54) hooks/hooks.py (+226/-0) hooks/install (+0/-19) hooks/start (+0/-4) hooks/stop (+0/-7) hooks/website-relation-joined (+0/-2) lib/charm-helpers/LICENSE.txt (+661/-0) lib/charm-helpers/MANIFEST.in (+6/-0) lib/charm-helpers/Makefile (+46/-0) lib/charm-helpers/README.test (+7/-0) lib/charm-helpers/README.txt (+8/-0) lib/charm-helpers/REVISION (+1/-0) lib/charm-helpers/VERSION (+1/-0) lib/charm-helpers/bin/README (+1/-0) lib/charm-helpers/bin/chlp (+7/-0) lib/charm-helpers/bin/contrib/charmsupport/charmsupport (+31/-0) lib/charm-helpers/bin/contrib/saltstack/salt-call (+11/-0) lib/charm-helpers/charmhelpers/cli/README.rst (+57/-0) lib/charm-helpers/charmhelpers/cli/__init__.py (+147/-0) lib/charm-helpers/charmhelpers/cli/commands.py (+2/-0) lib/charm-helpers/charmhelpers/cli/host.py (+14/-0) lib/charm-helpers/charmhelpers/contrib/ansible/__init__.py (+101/-0) lib/charm-helpers/charmhelpers/contrib/charmhelpers/IMPORT (+4/-0) lib/charm-helpers/charmhelpers/contrib/charmhelpers/__init__.py (+184/-0) lib/charm-helpers/charmhelpers/contrib/charmsupport/IMPORT (+14/-0) lib/charm-helpers/charmhelpers/contrib/charmsupport/nrpe.py (+218/-0) lib/charm-helpers/charmhelpers/contrib/charmsupport/volumes.py (+156/-0) lib/charm-helpers/charmhelpers/contrib/hahelpers/apache.py (+58/-0) lib/charm-helpers/charmhelpers/contrib/hahelpers/ceph.py (+294/-0) lib/charm-helpers/charmhelpers/contrib/hahelpers/cluster.py (+181/-0) lib/charm-helpers/charmhelpers/contrib/jujugui/IMPORT (+4/-0) lib/charm-helpers/charmhelpers/contrib/jujugui/utils.py (+602/-0) lib/charm-helpers/charmhelpers/contrib/network/ovs/__init__.py (+72/-0) lib/charm-helpers/charmhelpers/contrib/openstack/context.py (+294/-0) lib/charm-helpers/charmhelpers/contrib/openstack/templates/__init__.py (+2/-0) lib/charm-helpers/charmhelpers/contrib/openstack/templates/ceph.conf (+11/-0) lib/charm-helpers/charmhelpers/contrib/openstack/templates/haproxy.cfg (+37/-0) lib/charm-helpers/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+23/-0) lib/charm-helpers/charmhelpers/contrib/openstack/templating.py (+261/-0) lib/charm-helpers/charmhelpers/contrib/openstack/utils.py (+276/-0) lib/charm-helpers/charmhelpers/contrib/saltstack/__init__.py (+149/-0) lib/charm-helpers/charmhelpers/contrib/ssl/__init__.py (+79/-0) lib/charm-helpers/charmhelpers/contrib/storage/linux/loopback.py (+62/-0) lib/charm-helpers/charmhelpers/contrib/storage/linux/lvm.py (+88/-0) lib/charm-helpers/charmhelpers/contrib/storage/linux/utils.py (+25/-0) lib/charm-helpers/charmhelpers/contrib/templating/pyformat.py (+13/-0) lib/charm-helpers/charmhelpers/core/hookenv.py (+340/-0) lib/charm-helpers/charmhelpers/core/host.py (+241/-0) lib/charm-helpers/charmhelpers/fetch/__init__.py (+209/-0) lib/charm-helpers/charmhelpers/fetch/archiveurl.py (+48/-0) lib/charm-helpers/charmhelpers/fetch/bzrurl.py (+49/-0) lib/charm-helpers/charmhelpers/payload/__init__.py (+1/-0) lib/charm-helpers/charmhelpers/payload/archive.py (+57/-0) lib/charm-helpers/charmhelpers/payload/execd.py (+50/-0) lib/charm-helpers/debian/compat (+1/-0) lib/charm-helpers/debian/control (+20/-0) lib/charm-helpers/debian/rules (+9/-0) lib/charm-helpers/debian/source/format (+1/-0) lib/charm-helpers/scripts/README (+1/-0) lib/charm-helpers/scripts/update-revno (+11/-0) lib/charm-helpers/setup.cfg (+4/-0) lib/charm-helpers/setup.py (+42/-0) lib/charm-helpers/tarmac_tests.sh (+6/-0) lib/charm-helpers/test_requirements.txt (+18/-0) lib/charm-helpers/tests/cli/test_cmdline.py (+189/-0) lib/charm-helpers/tests/cli/test_function_signature_analysis.py (+46/-0) lib/charm-helpers/tests/contrib/ansible/test_ansible.py (+134/-0) lib/charm-helpers/tests/contrib/charmhelpers/test_charmhelpers.py (+290/-0) lib/charm-helpers/tests/contrib/charmsupport/test_nrpe.py (+222/-0) lib/charm-helpers/tests/contrib/hahelpers/test_apache_utils.py (+44/-0) lib/charm-helpers/tests/contrib/hahelpers/test_ceph_utils.py (+131/-0) lib/charm-helpers/tests/contrib/hahelpers/test_cluster_utils.py (+277/-0) lib/charm-helpers/tests/contrib/jujugui/config/apache-ports.template (+2/-0) lib/charm-helpers/tests/contrib/jujugui/config/apache-site.template (+30/-0) lib/charm-helpers/tests/contrib/jujugui/config/config.js.template (+26/-0) lib/charm-helpers/tests/contrib/jujugui/config/haproxy.cfg.template (+48/-0) lib/charm-helpers/tests/contrib/jujugui/config/haproxy.conf (+22/-0) lib/charm-helpers/tests/contrib/jujugui/config/juju-api-agent.conf.template (+14/-0) lib/charm-helpers/tests/contrib/jujugui/config/juju-api-improv.conf.template (+12/-0) lib/charm-helpers/tests/contrib/jujugui/deploy.test (+232/-0) lib/charm-helpers/tests/contrib/jujugui/test_utils.py (+660/-0) lib/charm-helpers/tests/contrib/jujugui/unit.test (+11/-0) lib/charm-helpers/tests/contrib/network/test_ovs.py (+202/-0) lib/charm-helpers/tests/contrib/openstack/test_openstack_utils.py (+421/-0) lib/charm-helpers/tests/contrib/openstack/test_os_contexts.py (+473/-0) lib/charm-helpers/tests/contrib/openstack/test_os_templating.py (+232/-0) lib/charm-helpers/tests/contrib/saltstack/test_saltstates.py (+229/-0) lib/charm-helpers/tests/contrib/ssl/test_ssl.py (+60/-0) lib/charm-helpers/tests/contrib/storage/test_linux_storage_loopback.py (+75/-0) lib/charm-helpers/tests/contrib/storage/test_linux_storage_lvm.py (+70/-0) lib/charm-helpers/tests/contrib/storage/test_linux_storage_utils.py (+23/-0) lib/charm-helpers/tests/contrib/templating/test_pyformat.py (+36/-0) lib/charm-helpers/tests/core/test_hookenv.py (+797/-0) lib/charm-helpers/tests/core/test_host.py (+678/-0) lib/charm-helpers/tests/fetch/test_archiveurl.py (+89/-0) lib/charm-helpers/tests/fetch/test_bzrurl.py (+80/-0) lib/charm-helpers/tests/fetch/test_fetch.py (+407/-0) lib/charm-helpers/tests/payload/test_archive.py (+131/-0) lib/charm-helpers/tests/payload/test_execd.py (+151/-0) lib/charm-helpers/tests/tools/test_charm_helper_sync.py (+249/-0) lib/charm-helpers/tools/charm_helpers_sync/README (+114/-0) lib/charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py (+225/-0) lib/charm-helpers/tools/charm_helpers_sync/example-config.yaml (+14/-0) metadata.yaml (+0/-10) revision (+0/-1) templates/gunicorn.conf.tmpl (+0/-18) templates/logging.conf.tmpl (+0/-31) templates/wikiconfig.py.tmpl (+0/-30) templates/wsgi.py.tmpl (+0/-10) |
| To merge this branch: | bzr merge lp://staging/~brad-marshall/charms/precise/python-moinmoin/python-rewrite-with-openid-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Ceppi (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Rewrote the charm in python using charm-helper.
Added openid auth support, testing can be done using:
$ juju set python-moinmoin use_openid=True openidrp_
Then try logging into http://<instance>:8080/ with a user in your-openid-team.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM +1, Thanks for the rewrite. You might want to consider linking to various appropriate sections of the docs in case the README methods become out of date, https:/