improvements
authorDavid Douard <david.douard@logilab.fr>
Mon, 02 Jun 2014 13:48:52 +0200
changeset 1 a0f87dba2b8f
parent 0 5106aa7d0a28
child 2 a94559c3bff9
improvements
cubicweb/init.sls
cubicweb/instances.sls
cubicweb/twisted.sls
--- a/cubicweb/init.sls	Tue Apr 29 10:02:32 2014 +0200
+++ b/cubicweb/init.sls	Mon Jun 02 13:48:52 2014 +0200
@@ -12,7 +12,7 @@
     - require:
       - pkgrepo: logilab-public-production
       - pkgrepo: logilab-public-acceptance
-    - fromrepo: production
+    - fromrepo: {{pillar.get('cubicweb_repo', 'production')}}
 
 cw-core:
   pkg.installed:
@@ -21,7 +21,7 @@
       - cubicweb-ctl
       - cubicweb-postgresql-support
       - cubicweb-server
-    - fromrepo: production
+    - fromrepo: {{pillar.get('cubicweb_repo', 'production')}}
     - require:
       - pkg: cw-logilab-deps
 
@@ -37,7 +37,7 @@
       - cubicweb-keyword
       - cubicweb-localperms
       - cubicweb-tag
-    - fromrepo: production
+    - fromrepo: {{pillar.get('cubicweb_repo', 'production')}}
     - require:
       - pkg: cw-core
 
@@ -46,6 +46,6 @@
     - pkgs:
       - cubicweb-web
       - cubicweb-twisted
-    - fromrepo: production
+    - fromrepo: {{pillar.get('cubicweb_repo', 'production')}}
     - require:
       - pkg: cw-core
--- a/cubicweb/instances.sls	Tue Apr 29 10:02:32 2014 +0200
+++ b/cubicweb/instances.sls	Mon Jun 02 13:48:52 2014 +0200
@@ -11,9 +11,8 @@
     - admin/login: {{config.cwapp.adminuser}}
     - admin/password: {{config.cwapp.adminpass}}
     - cubes: {{config.cwapp.cubes}}
-    - db-name: postgres
-    - db-host: {{  }}
-    - db-port: {{ who? }}
+    - db-host: {{config.database.host}}
+    - db-port: {{config.database.port}}
     - db-name: {{config.database.name}}
     - db-user: {{config.database.user}}
     - db-password: {{config.database.password}}
--- a/cubicweb/twisted.sls	Tue Apr 29 10:02:32 2014 +0200
+++ b/cubicweb/twisted.sls	Mon Jun 02 13:48:52 2014 +0200
@@ -6,7 +6,7 @@
     - names:
       - cubicweb-twisted
       - cubicweb-web
-    - fromrepo: production
+    - fromrepo: {{pillar.get('cubicweb_repo', 'production')}}
     - require:
       - pkg: cw-core