From 72515efabb73d77d2580c6f46284581020617f76 Mon Sep 17 00:00:00 2001
From: Ahmad Haghighi <haghighi@fedoraproject.org>
Date: Feb 19 2020 15:31:59 +0000
Subject: move some variables to vars/main.yml


---

diff --git a/defaults/main.yml b/defaults/main.yml
index a7f8965..3283b4f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,20 +2,23 @@
 # defaults file for nextcloud-docker
 
 # Use http/https/socks proxy
-use_proxy_env: false
+proxy_env:
+  http_proxy: ""
+  https_proxy: ""
 
-nextcloud_docker_compose_dir: "/opt/nextcloud-docker"
+# Moved to vars/main.yml
+# nextcloud_docker_compose_dir: "/opt/nextcloud-docker"
 
 # app 
 nextcloud_app_docker_version: "apache"
 nextcloud_app_docker_image: "nextcloud:{{nextcloud_app_docker_version}}"
-nextcloud_app_port: 8283
+# nextcloud_app_port: 8283 # Moved to vars/main.yml
 nextcloud_app_data_dir: "{{ nextcloud_docker_compose_dir }}/volumes/app"
 nextcloud_app_use_volume: true
 nextcloud_app_volume: "nextcloud"
 
 # SSL
-nextcloud_nginx_ssl: true
+#nextcloud_nginx_ssl: true # Moved to vars/main.yml
 
 # cron
 nextcloud_cron_docker_version: "apache"
@@ -27,13 +30,10 @@ nextcloud_db_docker_image: "mariadb:{{nextcloud_db_docker_version}}"
 nextcloud_db_data_dir: "{{ nextcloud_docker_compose_dir }}/volumes/db"
 nextcloud_db_use_volume: true
 nextcloud_db_volume: "db"
-nextcloud_mysql_password: "somepass"
-nextcloud_mysql_root_password: "somepass2"
-nextcloud_db_dnname: "nextcloud"
-nextcloud_db_user: "nextcloud"
+
 
 # Collabora office 
-nextcloud_office: false
-nextcloud_office_port: 9980
+# nextcloud_office: false # Moved to vars/main.yml
+# nextcloud_office_port: 9980 # Moved to vars/main.yml
 nextcloud_office_username: "admin"
 nextcloud_office_password: "ODlmM2Y4OTA0NTM4NGYxNmJjNGNiNjI3ODE0MjgxZTcgIC0K"
diff --git a/tasks/install_py_libs.yml b/tasks/install_py_libs.yml
index e1d45de..af731c0 100644
--- a/tasks/install_py_libs.yml
+++ b/tasks/install_py_libs.yml
@@ -16,4 +16,4 @@
     state: latest
     extra_args: " --no-cache-dir "
     executable: pip3
-  environment: "{{ proxy_env if ( use_proxy_env is sameas true  ) else [] }}"
+  environment: "{{ proxy_env }}"
diff --git a/vars/main.yml b/vars/main.yml
index c05bdf4..ae1ee2d 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,19 @@
 ---
-# vars file for nextcloud-docker
\ No newline at end of file
+# vars file for nextcloud-docker
+
+nextcloud_docker_compose_dir: "/opt/nextcloud-docker"
+
+nextcloud_app_port: 8181
+
+# Database
+nextcloud_mysql_password: "somepass"
+nextcloud_mysql_root_password: "somepass2"
+nextcloud_db_dnname: "nextcloud"
+nextcloud_db_user: "nextcloud"
+
+# Collabora Office
+nextcloud_office: false
+nextcloud_office_port: 9980
+
+# SSL
+nextcloud_nginx_ssl: true