Move the lib/html paths to defaults as they are now user modifiable

geerlingguy · Feb 29, 2016 · 50e21c6 · 50e21c6
1 parent 5a1715c
commit 50e21c6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,14 @@ Available variables are listed below, along with default values (see `defaults/m
 
 Directory where XHProf runs are stored.
 
+    php_xhprof_lib_dir: /usr/share/php/xhprof_lib
+
+Directory where the XHProf PHP library is stored.
+
+    php_xhprof_html_dir: /usr/share/php/xhprof_html
+
+Directory where the XHProf UI is stored.
+
 ## Dependencies
 
   - geerlingguy.php

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -2,3 +2,6 @@
 workspace: /root
 
 xhprof_output_dir: /var/tmp/xhprof
+
+php_xhprof_lib_dir: /usr/share/php/xhprof_lib
+php_xhprof_html_dir: /usr/share/php/xhprof_html
diff --git a/vars/Debian.yml b/vars/Debian.yml
@@ -1,9 +1,6 @@
 ---
 php_xhprof_module_path: /usr/lib/php5/modules
 
-php_xhprof_lib_dir: /usr/share/php/xhprof_lib
-php_xhprof_html_dir: /usr/share/php/xhprof_html
-
 php_xhprof_config_filename: 20-xhprof.ini
 php_xhprof_config_dirs:
   - /etc/php5/apache2/conf.d

diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -1,9 +1,6 @@
 ---
 php_xhprof_module_path: /usr/lib64/php/modules
 
-php_xhprof_lib_dir: /usr/share/pear/xhprof_lib
-php_xhprof_html_dir: /usr/share/pear/xhprof_html
-
 php_xhprof_config_filename: xhprof.ini
 php_xhprof_config_dirs:
   - /etc/php.d