diff --git a/roles/nuancier/tasks/main.yml b/roles/nuancier/tasks/main.yml index 0e083bb51c..6d19898999 100644 --- a/roles/nuancier/tasks/main.yml +++ b/roles/nuancier/tasks/main.yml @@ -23,7 +23,7 @@ dest="{{ item.location }}/{{ item.dest }}" owner=apache group=apache mode=0600 with_items: - - { file: nuancier_admin.cfg, location: /etc/nuancier, dest: nuancier-lite.cfg } + - { file: nuancier_admin.cfg, location: /etc/nuancier, dest: nuanciercfg } tags: - config notify: @@ -43,16 +43,16 @@ - setup - name: create the database scheme - command: /usr/bin/python2 /usr/share/nuancier/nuancier-lite_createdb.py + command: /usr/bin/python2 /usr/share/nuancier/nuancier_createdb.py environment: - NUANCIER_CONFIG: /etc/nuancier/nuancier-lite.cfg + NUANCIER_CONFIG: /etc/nuancier/nuancier.cfg - name: replace the nuancier configuration file by the one with the normal user template: src={{ item.file }} dest="{{ item.location }}/{{ item.file }}" owner=apache group=apache mode=0600 with_items: - - { file: nuancier-lite.cfg, location: /etc/nuancier } + - { file: nuancier.cfg, location: /etc/nuancier } - { file: nuancier.conf, location: /etc/httpd/conf.d } - { file: nuancier.wsgi, location: /usr/share/nuancier } tags: diff --git a/roles/nuancier/templates/nuancier-lite.cfg b/roles/nuancier/templates/nuancier.cfg similarity index 97% rename from roles/nuancier/templates/nuancier-lite.cfg rename to roles/nuancier/templates/nuancier.cfg index f2be484279..280a98c629 100644 --- a/roles/nuancier/templates/nuancier-lite.cfg +++ b/roles/nuancier/templates/nuancier.cfg @@ -8,7 +8,7 @@ SECRET_KEY='{{ nuancier_secret_key }}' ### url to the database server: DB_URL='postgresql://{{ nuancier_db_user }}:{{ nuancier_db_pass }}@{{ nuancier_db_host }}/{{ nuancier_db_name }}' -### The FAS groups in which the admin of nuancier-lite are +### The FAS groups in which the admin of nuancier are ### This can either be a single group or multiple, defined between ### parenthesis. ADMIN_GROUP=('sysadmin-nuancier', 'sysadmin-main') diff --git a/roles/nuancier/templates/nuancier.wsgi b/roles/nuancier/templates/nuancier.wsgi index 182804b10d..83f9f0f7c1 100644 --- a/roles/nuancier/templates/nuancier.wsgi +++ b/roles/nuancier/templates/nuancier.wsgi @@ -9,7 +9,7 @@ import pkg_resources import os # Set the environment variable pointing to the configuration file -os.environ['NUANCIER_CONFIG'] = '/etc/nuancier/nuancier-lite.cfg' +os.environ['NUANCIER_CONFIG'] = '/etc/nuancier/nuancier.cfg' # The most import line to make the wsgi working from nuancier import APP as application diff --git a/roles/nuancier/templates/nuancier_admin.cfg b/roles/nuancier/templates/nuancier_admin.cfg index 95288741ec..604c0756df 100644 --- a/roles/nuancier/templates/nuancier_admin.cfg +++ b/roles/nuancier/templates/nuancier_admin.cfg @@ -8,7 +8,7 @@ SECRET_KEY='{{ nuancier_secret_key }}' ### url to the database server: DB_URL='postgresql://{{ nuancier_db_admin_user }}:{{ nuancier_db_admin_pass }}@{{ nuancier_db_host }}/{{ nuancier_db_name }}' -### The FAS groups in which the admin of nuancier-lite are +### The FAS groups in which the admin of nuancier are ### This can either be a single group or multiple, defined between ### parenthesis. ADMIN_GROUP=('sysadmin-nuancier', 'sysadmin-main')