Canonical SSO provider

Merge lp:~matt-goodall/canonical-identity-provider/makefile-tweaks into lp:canonical-identity-provider/release

  1. makefile-tweaks
  2. Merge into trunk
Proposed by Matt Goodall
Status: Merged
Approved by: Matt Goodall
Approved revision: no longer in the source branch.
Merged at revision: 1252
Proposed branch: lp:~matt-goodall/canonical-identity-provider/makefile-tweaks
Merge into: lp:canonical-identity-provider/release
Diff against target: 27 lines (+3/-2)
2 files modified
Makefile (+2/-1)
Makefile.db (+1/-1)
To merge this branch: bzr merge lp:~matt-goodall/canonical-identity-provider/makefile-tweaks
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+250348@code.launchpad.net

Commit message

Fix start-db path. Extend run target to accept ARGS.

Description of the change

Fix start-db path. Extend run target to accept ARGS.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

12:51 < nessita> atomatt, I have a minor request which is that we use $() instead of ${}
12:53 < nessita> atomatt, approving with that comment, just change it and global approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-02-18 18:56:05 +0000
3+++ Makefile 2015-02-19 18:28:57 +0000
4@@ -130,8 +130,9 @@
5 manage:
6 $(DJANGO_MANAGE) $(ARGS)
7
8+run: ARGS=0.0.0.0:8000
9 run:
10- $(DJANGO_MANAGE) runserver 0.0.0.0:8000
11+ $(DJANGO_MANAGE) runserver $(ARGS)
12
13 start: bootstrap start-db
14
15
16=== modified file 'Makefile.db'
17--- Makefile.db 2015-02-18 18:56:05 +0000
18+++ Makefile.db 2015-02-19 18:28:57 +0000
19@@ -19,7 +19,7 @@
20 echo "fsync = off" > $(CONF_FILE)
21 echo "standard_conforming_strings = off" >> $(CONF_FILE)
22 echo "escape_string_warning = off" >> $(CONF_FILE)
23- $(PGCTL) start -w -D $(DATA_DIR) -l $(LOG_FILE) -o "-F -k /dev/shm/pg_sso -h ''"
24+ $(PGCTL) start -w -D $(DATA_DIR) -l $(LOG_FILE) -o "-F -k $(PGHOST) -h ''"
25 createdb $(PGNAME)
26 createuser --superuser --createdb $(PGUSER)
27 $(MAKE) syncdb