Add apt.logilab.fr signing key
authorPhilippe Pepiot <philippe.pepiot@logilab.fr>
Fri, 11 Oct 2019 10:45:34 +0200
changeset 132 d1d9f951bebc
parent 131 96820d1ded70
child 133 80b24cc45c50
Add apt.logilab.fr signing key
cubicweb/apache/vhost.sls
cubicweb/apache/vhost.tmpl
cubicweb/instances.sls
cubicweb/postgres/init.sls
cubicweb/pyramid/init.sls
cubicweb/uwsgi/init.sls
logilab/apt-logilab.gpg
logilab/signingkey.sls
--- a/cubicweb/apache/vhost.sls	Wed Feb 06 17:34:35 2019 +0100
+++ b/cubicweb/apache/vhost.sls	Fri Oct 11 10:45:34 2019 +0200
@@ -3,7 +3,7 @@
   - cubicweb.apache.reverseproxy
 
 
-{% for vhostname, vhost in pillar['cubicweb_apps'].iteritems() %}
+{% for vhostname, vhost in pillar['cubicweb_apps'].items() %}
 /etc/apache2/sites-available/{{ vhostname }}:
   file:
     - managed
--- a/cubicweb/apache/vhost.tmpl	Wed Feb 06 17:34:35 2019 +0100
+++ b/cubicweb/apache/vhost.tmpl	Fri Oct 11 10:45:34 2019 +0200
@@ -18,7 +18,7 @@
         Order deny,allow
         Allow from all
     </Proxy>
-{% for name, config in vhost.iteritems() %}
+{% for name, config in vhost.items() %}
     Include /etc/apache2/siteconf.d/{{ vhostname }}/*.conf
     ProxyPass {{ config.cwapp.get('basepath', '/') }} http://{{config.cwapp.backend}}:{{ config.cwapp.port }}/
     ProxyPassReverse {{ config.cwapp.get('basepath', '/') }} http://{{ config.cwapp.backend }}:{{ config.cwapp.port }}/
--- a/cubicweb/instances.sls	Wed Feb 06 17:34:35 2019 +0100
+++ b/cubicweb/instances.sls	Fri Oct 11 10:45:34 2019 +0200
@@ -13,8 +13,8 @@
         - file: /etc/apt/sources.list.d/extra_source_{{loop.index}}.list
 {% endfor %}
 
-{% for vhostname, vhost in pillar['cubicweb_apps'].iteritems() %}
- {% for name, config in vhost.iteritems() %}
+{% for vhostname, vhost in pillar['cubicweb_apps'].items() %}
+ {% for name, config in vhost.items() %}
 
 cw-{{vhostname}}-{{name}}:
   cubicweb_instance.present:
--- a/cubicweb/postgres/init.sls	Wed Feb 06 17:34:35 2019 +0100
+++ b/cubicweb/postgres/init.sls	Fri Oct 11 10:45:34 2019 +0200
@@ -43,8 +43,8 @@
 /etc/postgresql/{{ postgresql.version }}/main/pg_hba.conf:
   file.managed:
     {% set psql_users=[] %}
-    {% for vhostname, vhost in pillar['cubicweb_apps'].iteritems() %}
-      {% for name, config in vhost.iteritems() %}
+    {% for vhostname, vhost in pillar['cubicweb_apps'].items() %}
+      {% for name, config in vhost.items() %}
         {% if config.database.user not in psql_users %}
           {% do psql_users.append(config.database.user) %}
         {% endif %}
@@ -92,8 +92,8 @@
 {% endif %}
 
 
-{% for vhostname, vhost in pillar['cubicweb_apps'].iteritems() %}
- {% for name, config in vhost.iteritems() %}
+{% for vhostname, vhost in pillar['cubicweb_apps'].items() %}
+ {% for name, config in vhost.items() %}
 
 pg-{{vhostname}}-{{name}}:
   postgres_user.present:
--- a/cubicweb/pyramid/init.sls	Wed Feb 06 17:34:35 2019 +0100
+++ b/cubicweb/pyramid/init.sls	Fri Oct 11 10:45:34 2019 +0200
@@ -2,8 +2,8 @@
   - cubicweb.instances
   - cubicweb.uwsgi
 
-{% for vhostname, vhost in pillar['cubicweb_apps'].iteritems() %}
- {% for name, config in vhost.iteritems() %}
+{% for vhostname, vhost in pillar['cubicweb_apps'].items() %}
+ {% for name, config in vhost.items() %}
 /etc/cubicweb.d/{{ name }}/pyramid.ini:
   file.managed:
     - source: salt://cubicweb/pyramid/pyramid.ini
--- a/cubicweb/uwsgi/init.sls	Wed Feb 06 17:34:35 2019 +0100
+++ b/cubicweb/uwsgi/init.sls	Fri Oct 11 10:45:34 2019 +0200
@@ -9,8 +9,8 @@
       - uwsgi-plugin-python
 
 
-{% for vhostname, vhost in pillar['cubicweb_apps'].iteritems() %}
- {% for name, config in vhost.iteritems() %}
+{% for vhostname, vhost in pillar['cubicweb_apps'].items() %}
+ {% for name, config in vhost.items() %}
 /etc/uwsgi/apps-available/{{ name }}.ini:
   file.managed:
     - source: salt://cubicweb/uwsgi/uwsgi.ini
Binary file logilab/apt-logilab.gpg has changed
--- a/logilab/signingkey.sls	Wed Feb 06 17:34:35 2019 +0100
+++ b/logilab/signingkey.sls	Fri Oct 11 10:45:34 2019 +0200
@@ -3,3 +3,8 @@
     - name: /etc/apt/trusted.gpg.d/logilab.gpg
     - source: salt://logilab/logilab.gpg
 
+apt-logilab-signing-key:
+  file.managed:
+    - name: /etc/apt/trusted.gpg.d/apt-logilab.gpg
+    - source: salt://logilab/apt-logilab.gpg
+