From 88752e419a5c2708d11374969bee56a72bff25ad Mon Sep 17 00:00:00 2001 From: Aidan Fitzgerald Date: Mon, 23 Jul 2018 22:57:12 -0400 Subject: [PATCH] SQLite comes with Python so no database setup required --- roles/lokole/defaults/main.yml | 6 ------ roles/lokole/tasks/install.yml | 35 ---------------------------------- 2 files changed, 41 deletions(-) diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml index 0fc567e3c..5a65b5009 100644 --- a/roles/lokole/defaults/main.yml +++ b/roles/lokole/defaults/main.yml @@ -8,12 +8,6 @@ lokole_venv: "{{ lokole_install_path }}/venv" lokole_user: lokole lokole_run_directory: /home/{{ lokole_user }}/state -# Everything below this line is unused - -lokole_db_name: iiab_lokole -lokole_db_user: iiab_lokole_user -lokole_db_user_password: changeme - lokole_install: True lokole_enabled: True diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml index 24b072e74..36b25a674 100644 --- a/roles/lokole/tasks/install.yml +++ b/roles/lokole/tasks/install.yml @@ -37,41 +37,6 @@ # Everything below this line is unused -- name: MySQL database needs to be running if we are trying to create a new db - service: - state: started - name: "{{ mysql_service }}" - -- name: Create MySQL lokole database - mysql_db: - name: "{{ lokole_db_name }}" - state: present - -- name: Create MySQL lokole database user - mysql_user: - name: "{{ lokole_db_user }}" - password: "{{ lokole_db_user_password }}" - priv: "{{ lokole_db_name }}.*:ALL,GRANT" - state: present - -- name: Configure Lokole - shell: > - php '{{ lokole_abs_path }}/maintenance/install.php' - --dbname={{ lokole_db_name }} - --dbserver="localhost" - --installdbuser={{ lokole_db_user }} - --installdbpass={{ lokole_db_user_password }} - --dbuser={{ lokole_db_user }} - --dbpass={{ lokole_db_user_password }} - --scriptpath=/lokole - --lang=en - --pass={{ lokole_admin_user_password }} - "{{ lokole_site_name }}" - "{{ lokole_admin_user }}" - args: - chdir: "{{ lokole_abs_path }}" - creates: "{{ lokole_abs_path }}/LocalSettings.php" - - name: Copy lokole httpd conf file template: src: lokole.conf.j2