start clean-up

uwsgi-python/meta/main.yml

----
-# file: uwsgi-python/meta/main.yml
-dependencies:
-  - { role: uwsgi }

uwsgi-python/tasks/app.yml

 ---
 
-#
-#- debug: 
-#    msg: "{{ app }}"
-#
-#
 
 - include_vars: "{{ item }}"
   with_items:
@@ -25,7 +20,7 @@
     - python-virtualenv
     - uwsgi-plugin-python
     - virtualenv
-  when: uwsgi_python == 2
+  when: app_python_version == 2
   tags:
     - uwsgi-app
     - "{{ app.app }}"
@@ -41,7 +36,7 @@
     - python3-virtualenv
     - uwsgi-plugin-python3
     - virtualenv
-  when: uwsgi_python == 3
+  when: app_python_version == 3
   tags:
     - uwsgi-app
     - "{{ app.app }}"

uwsgi-python/tasks/mysql.yml

@@ -15,7 +15,7 @@
 
 - name: ensure the mysql database exists
   mysql_db:
-    name: "{{ app_name }}"
+    name: "{{ app_db_name }}"
     state: present
     login_user: root
     login_password: "{{ lookup('passwordstore', 'db/{{ansible_hostname}}-mysql create=true length=20') }}"
@@ -27,11 +27,11 @@
 - name: ensure the database user for mysql exists
   mysql_user:
     name: "{{ app_user }}"
-    password: "{{ lookup('passwordstore', 'db/{{ansible_hostname}}-mysql-{{uwsgi_user}} create=true length=20') }}"
+    password: "{{ lookup('passwordstore', 'db/{{ansible_hostname}}-mysql-{{app_user}} create=true length=20') }}"
     state: present
     login_user: root
     login_password: "{{lookup('passwordstore', 'db/{{ansible_hostname}}-mysql create=true length=20')}}"
-    priv: "{{ app_name }}.*:ALL"
+    priv: "{{ app_db_name }}.*:ALL"
   no_log: True
   tags:
     - uwsgi-python

uwsgi-python/templates/uwsgi.ini.j2

 [uwsgi]
-uwsgi-socket = /run/uwsgi/{{app_name}}/{{app_name}}.sock
+uwsgi-socket = /run/uwsgi/{{app.instance}}/{{app.instance}}.sock
 #http = localhost:5000
 chmod-socket = 660
 chown-socket = {{app_user}}:www-data

uwsgi-python/tmpfiles.conf

-d /run/uwsgi 0755 root root - -
-d /run/uwsgi/app 0755 root root - -

uwsgi-python/vars/shorturl.yml

 app_name: shorturl
-app_user: shortlinks
-app_group: shortlinks
+app_user: shorturl
+app_group: shorturl
 app_home: /var/www/shorturl
 app_path: /var/www/shorturl
 app_python_version: 3
@@ -10,8 +10,11 @@ app_callable: app
 app_command: ""
 app_mountpoint: /
 
+app_db_name: shorturl
 app_db_type: postgres
 
+app_additional_software: []
+
 app_deploy_key: "{{ inventory_dir }}/files/deploy-keys/shorturl"
 app_git_url: "git@git.fsmpi.rwth-aachen.de:infra/shorturl.git"
 app_git_version: HEAD

uwsgi-python/vars/template.yml

-name: 
-user
-group
-home
-path
-python_version
-venv
-program = server.py
-callable = app
-command 
-mountpoint
-
-db_type
-
-
-
-uwsgi_options 
-uwsgi_harakiri
-uwsgi_mules
-uwsgi_enable_threads
-
-app_deploy_key
-app_git_url
-app_git_version
-
-config_file
-secret_config = T/F
-