Juju Charms Collection
tanuki-spec-manager package

Merge lp:~verterok/charms/trusty/tanuki-spec-manager/dir-layout-policy into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk

  1. Trusty Tahr (14.04)
  2. dir-layout-policy
  3. Merge into trunk
Proposed by Guillermo Gonzalez
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: 14
Merged at revision: 13
Proposed branch: lp:~verterok/charms/trusty/tanuki-spec-manager/dir-layout-policy
Merge into: lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk
Prerequisite: lp:~verterok/charms/trusty/tanuki-spec-manager/db-relation
Diff against target: 44 lines (+7/-6)
3 files modified
hooks/actions.py (+1/-1)
hooks/schema-upgrade (+4/-3)
templates/upstart.conf (+2/-2)
To merge this branch: bzr merge lp:~verterok/charms/trusty/tanuki-spec-manager/dir-layout-policy
Reviewer Review Type Date Requested Status
Facundo Batista (community) Approve
Review via email: mp+265291@code.launchpad.net

Commit message

Update directory structure to match IS policy

Description of the change

Update directory structure to match IS policy

To post a comment you must log in.
Revision history for this message
Facundo Batista (facundo) wrote :

Nice

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/actions.py'
2--- hooks/actions.py 2015-07-20 17:01:02 +0000
3+++ hooks/actions.py 2015-07-20 17:01:03 +0000
4@@ -22,7 +22,7 @@
5
6 config = hookenv.config()
7
8-BASE_DIR = '/srv/{}'.format(config['environment'])
9+BASE_DIR = '/srv/spec-manager/{}'.format(config['environment'])
10 SERVICE_DIR = os.path.join(BASE_DIR, 'spec-manager')
11 LOG_DIR = os.path.join(BASE_DIR, 'logs')
12 ETC_DIR = os.path.join(BASE_DIR, 'etc')
13
14=== modified file 'hooks/schema-upgrade'
15--- hooks/schema-upgrade 2015-07-20 17:01:02 +0000
16+++ hooks/schema-upgrade 2015-07-20 17:01:03 +0000
17@@ -12,9 +12,10 @@
18 hooks = hookenv.Hooks()
19 config = hookenv.config()
20
21-DB_FILE = '/srv/{}/etc/db-schema.yaml'.format(config['environment'])
22-DB_ADMIN_FILE = '/srv/{}/etc/db-admin.yaml'.format(config['environment'])
23-SERVICE_DIR = '/srv/{}/spec-manager'.format(config['environment'])
24+BASE_DIR = '/srv/spec-manager/{}'.format(config['environment'])
25+DB_FILE = '{}/etc/db-schema.yaml'.format(BASE_DIR)
26+DB_ADMIN_FILE = '{}/etc/db-admin.yaml'.format(BASE_DIR)
27+SERVICE_DIR = '{}/spec-manager'.format(BASE_DIR)
28
29
30 @hooks.hook('schema-upgrade')
31
32=== modified file 'templates/upstart.conf'
33--- templates/upstart.conf 2015-07-20 17:01:02 +0000
34+++ templates/upstart.conf 2015-07-20 17:01:03 +0000
35@@ -11,8 +11,8 @@
36 # unless it fails 15 times within 5 seconds
37 respawn limit 15 5
38
39-env LOG_DIR=/srv/{{ environment }}/logs
40-env SERVICE_DIR=/srv/{{ environment }}/spec-manager
41+env LOG_DIR=/srv/spec-manager/{{ environment }}/logs
42+env SERVICE_DIR=/srv/spec-manager/{{ environment }}/spec-manager
43
44 script
45

Subscribers

People subscribed via source and target branches