add php.ini

diff --git a/hhvm.spec b/hhvm.spec
index 4b4c9c010e5ad3fddda89f2adb316f506548221e..6b819739f88382831c38f15488d62681dca25f1e 100644 (file)
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -20,6 +20,7 @@ Source3:      https://github.com/hhvm/hhvm-third-party/archive/%{thirdparty}/third_pa
 # Source3-md5: 9d40c3fbf1394bb1f03648d7046f8b9c
 Source4:       %{name}-fcgi.init
 Source5:       %{name}-fcgi.sysconfig
+Source6:       php.ini
 Source100:     get-source.sh
 Patch0:                ccache.patch
 Patch1:                no-debug.patch
@@ -281,9 +282,11 @@ fi
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}
 if [ ! -f installed.stamp ]; then
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 # begin install block
 
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+
 ln -s hhvm $RPM_BUILD_ROOT%{_bindir}/php
 ln -s hhvm $RPM_BUILD_ROOT%{_bindir}/hphp
 
@@ -356,6 +359,7 @@ fi
 %defattr(644,root,root,755)
 %doc README.md hphp/NEWS
 %dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/php.ini
 %attr(755,root,root) %{_bindir}/hhvm
 %attr(755,root,root) %{_bindir}/hphp
 

diff --git a/php.ini b/php.ini
new file mode 100644 (file)
index 0000000..b6963b0
--- /dev/null
+++ b/php.ini
@@ -0,0 +1,13 @@
+[PHP]
+;;;;;;;;;;;;;;;;;;;;;;;;;
+; Paths and Directories ;
+;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; PHP's default setting for include_path is ".;/path/to/php/pear"
+; http://php.net/include-path
+;include_path = .:/usr/share/pear:/usr/share/php
+
+[Date]
+; Defines the default timezone used by the date functions
+; http://php.net/date.timezone
+;date.timezone = Europe/Tallinn