Merge ~pwlars/revcache/+git/revcache-charm:config-vhost-file into revcache:master
Proposed by
Paul Larson
| Status: | Superseded |
|---|---|
| Proposed branch: | ~pwlars/revcache/+git/revcache-charm:config-vhost-file |
| Merge into: | revcache:master |
| Diff against target: |
29627 lines (+28503/-0) 187 files modified
.gitignore (+3/-0) README.md (+221/-0) config.yaml (+25/-0) copyright (+9/-0) hooks/charmhelpers/__init__.py (+97/-0) hooks/charmhelpers/contrib/__init__.py (+13/-0) hooks/charmhelpers/contrib/amulet/__init__.py (+13/-0) hooks/charmhelpers/contrib/amulet/deployment.py (+99/-0) hooks/charmhelpers/contrib/amulet/utils.py (+820/-0) hooks/charmhelpers/contrib/ansible/__init__.py (+252/-0) hooks/charmhelpers/contrib/benchmark/__init__.py (+124/-0) hooks/charmhelpers/contrib/charmhelpers/IMPORT (+4/-0) hooks/charmhelpers/contrib/charmhelpers/__init__.py (+203/-0) hooks/charmhelpers/contrib/charmsupport/IMPORT (+14/-0) hooks/charmhelpers/contrib/charmsupport/__init__.py (+13/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+455/-0) hooks/charmhelpers/contrib/charmsupport/volumes.py (+173/-0) hooks/charmhelpers/contrib/database/__init__.py (+11/-0) hooks/charmhelpers/contrib/database/mysql.py (+577/-0) hooks/charmhelpers/contrib/hahelpers/__init__.py (+13/-0) hooks/charmhelpers/contrib/hahelpers/apache.py (+86/-0) hooks/charmhelpers/contrib/hahelpers/cluster.py (+406/-0) hooks/charmhelpers/contrib/hardening/README.hardening.md (+38/-0) hooks/charmhelpers/contrib/hardening/__init__.py (+13/-0) hooks/charmhelpers/contrib/hardening/apache/__init__.py (+17/-0) hooks/charmhelpers/contrib/hardening/apache/checks/__init__.py (+29/-0) hooks/charmhelpers/contrib/hardening/apache/checks/config.py (+104/-0) hooks/charmhelpers/contrib/hardening/apache/templates/99-hardening.conf (+32/-0) hooks/charmhelpers/contrib/hardening/apache/templates/alias.conf (+31/-0) hooks/charmhelpers/contrib/hardening/audits/__init__.py (+54/-0) hooks/charmhelpers/contrib/hardening/audits/apache.py (+100/-0) hooks/charmhelpers/contrib/hardening/audits/apt.py (+103/-0) hooks/charmhelpers/contrib/hardening/audits/file.py (+550/-0) hooks/charmhelpers/contrib/hardening/defaults/apache.yaml (+16/-0) hooks/charmhelpers/contrib/hardening/defaults/apache.yaml.schema (+12/-0) hooks/charmhelpers/contrib/hardening/defaults/mysql.yaml (+38/-0) hooks/charmhelpers/contrib/hardening/defaults/mysql.yaml.schema (+15/-0) hooks/charmhelpers/contrib/hardening/defaults/os.yaml (+68/-0) hooks/charmhelpers/contrib/hardening/defaults/os.yaml.schema (+43/-0) hooks/charmhelpers/contrib/hardening/defaults/ssh.yaml (+49/-0) hooks/charmhelpers/contrib/hardening/defaults/ssh.yaml.schema (+42/-0) hooks/charmhelpers/contrib/hardening/harden.py (+96/-0) hooks/charmhelpers/contrib/hardening/host/__init__.py (+17/-0) hooks/charmhelpers/contrib/hardening/host/checks/__init__.py (+48/-0) hooks/charmhelpers/contrib/hardening/host/checks/apt.py (+37/-0) hooks/charmhelpers/contrib/hardening/host/checks/limits.py (+53/-0) hooks/charmhelpers/contrib/hardening/host/checks/login.py (+65/-0) hooks/charmhelpers/contrib/hardening/host/checks/minimize_access.py (+50/-0) hooks/charmhelpers/contrib/hardening/host/checks/pam.py (+132/-0) hooks/charmhelpers/contrib/hardening/host/checks/profile.py (+49/-0) hooks/charmhelpers/contrib/hardening/host/checks/securetty.py (+37/-0) hooks/charmhelpers/contrib/hardening/host/checks/suid_sgid.py (+129/-0) hooks/charmhelpers/contrib/hardening/host/checks/sysctl.py (+209/-0) hooks/charmhelpers/contrib/hardening/host/templates/10.hardcore.conf (+8/-0) hooks/charmhelpers/contrib/hardening/host/templates/99-hardening.sh (+5/-0) hooks/charmhelpers/contrib/hardening/host/templates/99-juju-hardening.conf (+7/-0) hooks/charmhelpers/contrib/hardening/host/templates/login.defs (+349/-0) hooks/charmhelpers/contrib/hardening/host/templates/modules (+117/-0) hooks/charmhelpers/contrib/hardening/host/templates/passwdqc.conf (+11/-0) hooks/charmhelpers/contrib/hardening/host/templates/pinerolo_profile.sh (+8/-0) hooks/charmhelpers/contrib/hardening/host/templates/securetty (+11/-0) hooks/charmhelpers/contrib/hardening/host/templates/tally2 (+14/-0) hooks/charmhelpers/contrib/hardening/mysql/__init__.py (+17/-0) hooks/charmhelpers/contrib/hardening/mysql/checks/__init__.py (+29/-0) hooks/charmhelpers/contrib/hardening/mysql/checks/config.py (+87/-0) hooks/charmhelpers/contrib/hardening/mysql/templates/hardening.cnf (+12/-0) hooks/charmhelpers/contrib/hardening/ssh/__init__.py (+17/-0) hooks/charmhelpers/contrib/hardening/ssh/checks/__init__.py (+29/-0) hooks/charmhelpers/contrib/hardening/ssh/checks/config.py (+435/-0) hooks/charmhelpers/contrib/hardening/ssh/templates/ssh_config (+70/-0) hooks/charmhelpers/contrib/hardening/ssh/templates/sshd_config (+159/-0) hooks/charmhelpers/contrib/hardening/templating.py (+73/-0) hooks/charmhelpers/contrib/hardening/utils.py (+155/-0) hooks/charmhelpers/contrib/mellanox/__init__.py (+13/-0) hooks/charmhelpers/contrib/mellanox/infiniband.py (+153/-0) hooks/charmhelpers/contrib/network/__init__.py (+13/-0) hooks/charmhelpers/contrib/network/ip.py (+602/-0) hooks/charmhelpers/contrib/network/ovs/__init__.py (+249/-0) hooks/charmhelpers/contrib/network/ufw.py (+339/-0) hooks/charmhelpers/contrib/openstack/__init__.py (+13/-0) hooks/charmhelpers/contrib/openstack/alternatives.py (+44/-0) hooks/charmhelpers/contrib/openstack/amulet/__init__.py (+13/-0) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+361/-0) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+1588/-0) hooks/charmhelpers/contrib/openstack/audits/__init__.py (+212/-0) hooks/charmhelpers/contrib/openstack/audits/openstack_security_guide.py (+266/-0) hooks/charmhelpers/contrib/openstack/cert_utils.py (+287/-0) hooks/charmhelpers/contrib/openstack/context.py (+1974/-0) hooks/charmhelpers/contrib/openstack/exceptions.py (+21/-0) hooks/charmhelpers/contrib/openstack/files/__init__.py (+16/-0) hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+34/-0) hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+30/-0) hooks/charmhelpers/contrib/openstack/ha/__init__.py (+13/-0) hooks/charmhelpers/contrib/openstack/ha/utils.py (+348/-0) hooks/charmhelpers/contrib/openstack/ip.py (+197/-0) hooks/charmhelpers/contrib/openstack/keystone.py (+178/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+354/-0) hooks/charmhelpers/contrib/openstack/ssh_migrations.py (+412/-0) hooks/charmhelpers/contrib/openstack/templates/__init__.py (+16/-0) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+24/-0) hooks/charmhelpers/contrib/openstack/templates/git.upstart (+17/-0) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+77/-0) hooks/charmhelpers/contrib/openstack/templates/logrotate (+9/-0) hooks/charmhelpers/contrib/openstack/templates/memcached.conf (+53/-0) hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+29/-0) hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+1/-0) hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+12/-0) hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken-legacy (+10/-0) hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken-mitaka (+22/-0) hooks/charmhelpers/contrib/openstack/templates/section-oslo-cache (+6/-0) hooks/charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit (+10/-0) hooks/charmhelpers/contrib/openstack/templates/section-oslo-middleware (+5/-0) hooks/charmhelpers/contrib/openstack/templates/section-oslo-notifications (+12/-0) hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo (+22/-0) hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0) hooks/charmhelpers/contrib/openstack/templates/wsgi-openstack-api.conf (+91/-0) hooks/charmhelpers/contrib/openstack/templates/wsgi-openstack-metadata.conf (+1/-0) hooks/charmhelpers/contrib/openstack/templating.py (+379/-0) hooks/charmhelpers/contrib/openstack/utils.py (+1843/-0) hooks/charmhelpers/contrib/openstack/vaultlocker.py (+126/-0) hooks/charmhelpers/contrib/peerstorage/__init__.py (+267/-0) hooks/charmhelpers/contrib/python.py (+21/-0) hooks/charmhelpers/contrib/saltstack/__init__.py (+116/-0) hooks/charmhelpers/contrib/ssl/__init__.py (+92/-0) hooks/charmhelpers/contrib/ssl/service.py (+277/-0) hooks/charmhelpers/contrib/storage/__init__.py (+13/-0) hooks/charmhelpers/contrib/storage/linux/__init__.py (+13/-0) hooks/charmhelpers/contrib/storage/linux/bcache.py (+74/-0) hooks/charmhelpers/contrib/storage/linux/ceph.py (+1562/-0) hooks/charmhelpers/contrib/storage/linux/loopback.py (+88/-0) hooks/charmhelpers/contrib/storage/linux/lvm.py (+182/-0) hooks/charmhelpers/contrib/storage/linux/utils.py (+126/-0) hooks/charmhelpers/contrib/templating/__init__.py (+13/-0) hooks/charmhelpers/contrib/templating/contexts.py (+137/-0) hooks/charmhelpers/contrib/templating/jinja.py (+38/-0) hooks/charmhelpers/contrib/templating/pyformat.py (+27/-0) hooks/charmhelpers/contrib/unison/__init__.py (+314/-0) hooks/charmhelpers/core/__init__.py (+13/-0) hooks/charmhelpers/core/decorators.py (+55/-0) hooks/charmhelpers/core/files.py (+43/-0) hooks/charmhelpers/core/fstab.py (+132/-0) hooks/charmhelpers/core/hookenv.py (+1490/-0) hooks/charmhelpers/core/host.py (+1077/-0) hooks/charmhelpers/core/host_factory/__init__.py (+0/-0) hooks/charmhelpers/core/host_factory/centos.py (+72/-0) hooks/charmhelpers/core/host_factory/ubuntu.py (+114/-0) hooks/charmhelpers/core/hugepage.py (+69/-0) hooks/charmhelpers/core/kernel.py (+72/-0) hooks/charmhelpers/core/kernel_factory/__init__.py (+0/-0) hooks/charmhelpers/core/kernel_factory/centos.py (+17/-0) hooks/charmhelpers/core/kernel_factory/ubuntu.py (+13/-0) hooks/charmhelpers/core/services/__init__.py (+16/-0) hooks/charmhelpers/core/services/base.py (+362/-0) hooks/charmhelpers/core/services/helpers.py (+290/-0) hooks/charmhelpers/core/strutils.py (+129/-0) hooks/charmhelpers/core/sysctl.py (+65/-0) hooks/charmhelpers/core/templating.py (+93/-0) hooks/charmhelpers/core/unitdata.py (+525/-0) hooks/charmhelpers/fetch/__init__.py (+207/-0) hooks/charmhelpers/fetch/archiveurl.py (+165/-0) hooks/charmhelpers/fetch/bzrurl.py (+76/-0) hooks/charmhelpers/fetch/centos.py (+171/-0) hooks/charmhelpers/fetch/giturl.py (+69/-0) hooks/charmhelpers/fetch/python/__init__.py (+13/-0) hooks/charmhelpers/fetch/python/debug.py (+54/-0) hooks/charmhelpers/fetch/python/packages.py (+154/-0) hooks/charmhelpers/fetch/python/rpdb.py (+56/-0) hooks/charmhelpers/fetch/python/version.py (+32/-0) hooks/charmhelpers/fetch/snap.py (+150/-0) hooks/charmhelpers/fetch/ubuntu.py (+728/-0) hooks/charmhelpers/osplatform.py (+25/-0) hooks/charmhelpers/payload/__init__.py (+15/-0) hooks/charmhelpers/payload/archive.py (+71/-0) hooks/charmhelpers/payload/execd.py (+65/-0) hooks/config-changed (+21/-0) hooks/db-relation-changed (+21/-0) hooks/db-relation-joined (+21/-0) hooks/hooks.py (+21/-0) hooks/install (+21/-0) hooks/start (+21/-0) hooks/stop (+21/-0) metadata.yaml (+27/-0) playbooks/revcache.yaml (+201/-0) templates/revcache-vhost-https.conf (+14/-0) templates/revcache-vhost.conf (+12/-0) templates/revcache.conf (+2/-0) templates/revcache.service (+13/-0) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Canonical Hardware Certification | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2019-04-30.
Description of the change
Tested locally, this is needed now because IS wants us to pull in the ssl certs through a subordinate charm now. Since that charm will now control setting the ssl cert, we can't set it through our charm, so we need a way to force the vhost file to be what we want rather than having it automatically do the right thing.
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
