Apache2 Charm

Merge ~cjohnston/apache2-charm:docs-dev-cleanup into apache2-charm:master

  1. Git
  2. lp:~cjohnston/apache2-charm
  3. docs-dev-cleanup
  4. Merge into master
Proposed by Chris Johnston
Status: Merged
Approved by: Tom Haddon
Approved revision: 04d5803f04e0807ccae6c7a0aa20215945f241c2
Merged at revision: 15907714fac08db82be539ebf4a5462b5d4706cb
Proposed branch: ~cjohnston/apache2-charm:docs-dev-cleanup
Merge into: apache2-charm:master
Diff against target: 28 lines (+2/-4)
2 files modified
README.md (+0/-3)
hooks/hooks.py (+2/-1)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+425411@code.launchpad.net

Commit message

Clean up old dev instructions, fixed long line.

Description of the change

The PPA should no longer be needed, so removed that (plus the username changed).
In order to have `make build` pass I cleaned up a line that was too long.

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 15907714fac08db82be539ebf4a5462b5d4706cb

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index 720ab56..4f2701a 100644
3--- a/README.md
4+++ b/README.md
5@@ -305,9 +305,6 @@ apache_openid
6 The following steps are needed for testing and development of the
7 charm, but **not** for deployment:
8
9- sudo apt-get install python-software-properties
10- sudo add-apt-repository ppa:chrisjohnston/flake8
11- sudo apt-get update
12 sudo apt-get install python-flake8 python-nose python-coverage \
13 python-testtools python-pyasn1 python-pyasn1-modules
14
15diff --git a/hooks/hooks.py b/hooks/hooks.py
16index 6128b34..0cf8657 100755
17--- a/hooks/hooks.py
18+++ b/hooks/hooks.py
19@@ -760,7 +760,8 @@ def config_changed():
20 if config_data["config_change_command"] in ["reload", "restart"]:
21 service_apache2(config_data["config_change_command"])
22 else:
23- status_set("blocked", "service check failed, possible invalid configuration")
24+ status_set(
25+ "blocked", "service check failed, possible invalid configuration")
26 return
27
28 if config_data['openid_provider']:

Subscribers

People subscribed via source and target branches