diff --git a/uwsgi-python/meta/main.yml b/uwsgi-python/meta/main.yml deleted file mode 100644 index 97abf43d219480c45fd9c13a3d68585dadacb4a3..0000000000000000000000000000000000000000 --- a/uwsgi-python/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# file: uwsgi-python/meta/main.yml -dependencies: - - { role: uwsgi } diff --git a/uwsgi-python/tasks/app.yml b/uwsgi-python/tasks/app.yml index b8acf026303633e6caba00f817f00711c66ec371..256b9ca5f3bea7364a4ad54d97ff2d38d6b45939 100644 --- a/uwsgi-python/tasks/app.yml +++ b/uwsgi-python/tasks/app.yml @@ -1,10 +1,5 @@ --- -# -#- 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 }}" diff --git a/uwsgi-python/tasks/mysql.yml b/uwsgi-python/tasks/mysql.yml index 7dbaee953eb7c8374b83ef9fd4a143aa1e508c96..7001771ecc4d4a3de4993e424826b2c042abc675 100644 --- a/uwsgi-python/tasks/mysql.yml +++ b/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 diff --git a/uwsgi-python/templates/uwsgi.ini.j2 b/uwsgi-python/templates/uwsgi.ini.j2 index 0bb1258ee069d974f8ce4ffd0300c752847138ea..01d4119eecf791dd4f64ea2ea9d85a7985ed7934 100644 --- a/uwsgi-python/templates/uwsgi.ini.j2 +++ b/uwsgi-python/templates/uwsgi.ini.j2 @@ -1,5 +1,5 @@ [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 diff --git a/uwsgi-python/tmpfiles.conf b/uwsgi-python/tmpfiles.conf deleted file mode 100644 index 50b2862b7b5bfbdf7fafd0f4e6a54f0280e8c743..0000000000000000000000000000000000000000 --- a/uwsgi-python/tmpfiles.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /run/uwsgi 0755 root root - - -d /run/uwsgi/app 0755 root root - - diff --git a/uwsgi-python/vars/shorturl.yml b/uwsgi-python/vars/shorturl.yml index eee6f777093c47e268e112a0233b3bfc487db2d4..4ef60910d73cc070f8a21a0b2f2d4fba8ee24b3b 100644 --- a/uwsgi-python/vars/shorturl.yml +++ b/uwsgi-python/vars/shorturl.yml @@ -1,6 +1,6 @@ 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 diff --git a/uwsgi-python/vars/template.yml b/uwsgi-python/vars/template.yml deleted file mode 100644 index 9b8b8ce060edd93235faf88376540afb9d91d5b4..0000000000000000000000000000000000000000 --- a/uwsgi-python/vars/template.yml +++ /dev/null @@ -1,28 +0,0 @@ -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 -