Merge branch 'dev'

Put packages.conf in usr dir
Merge pull request #64 from leokhoa/dev
2019-02-14 11:27:33 +00:00 · 2019-02-14 11:25:49 +00:00 · 2019-02-14 18:23:07 +07:00 · 2019-02-14 11:22:30 +00:00 · 2019-02-14 08:47:31 +07:00 · 2019-02-14 08:47:10 +07:00
3 changed files with 29 additions and 29 deletions
--- a/bin/laragon/tpl/VirtualHost.SSL.manifest.tpl
+++ b/bin/laragon/tpl/VirtualHost.SSL.manifest.tpl
@@ -1,27 +1,27 @@
-define ROOT "<<PROJECT_DIR>>"
-define SITE "<<HOSTNAME>>"
-
-<VirtualHost *:<<PORT>>> 
-    DocumentRoot "${ROOT}"
-    ServerName ${SITE}
-    ServerAlias *.${SITE}
-    <Directory "${ROOT}">
-        AllowOverride All
-        Require all granted
-    </Directory>
-</VirtualHost>
-
-<VirtualHost *:<<SSL_PORT>>>
-    DocumentRoot "${ROOT}"
-    ServerName ${SITE}
-    ServerAlias *.${SITE}
-    <Directory "${ROOT}">
-        AllowOverride All
-        Require all granted
-    </Directory>
-
-    SSLEngine on
-    SSLCertificateFile      <<SSL_DIR>>/<<HOSTNAME>>.crt
-    SSLCertificateKeyFile   <<SSL_DIR>>/<<HOSTNAME>>.key
- 
-</VirtualHost>
+define ROOT "<<PROJECT_DIR>>"
+define SITE "<<HOSTNAME>>"
+
+<VirtualHost *:<<PORT>>> 
+    DocumentRoot "${ROOT}"
+    ServerName ${SITE}
+    ServerAlias *.${SITE}
+    <Directory "${ROOT}">
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
+
+<VirtualHost *:<<SSL_PORT>>>
+    DocumentRoot "${ROOT}"
+    ServerName ${SITE}
+    ServerAlias *.${SITE}
+    <Directory "${ROOT}">
+        AllowOverride All
+        Require all granted
+    </Directory>
+
+    SSLEngine on
+    SSLCertificateFile      <<SSL_DIR>>/<<HOSTNAME>>.crt
+    SSLCertificateKeyFile   <<SSL_DIR>>/<<HOSTNAME>>.key
+ 
+</VirtualHost>
--- a/laragon.exe
+++ b/laragon.exe
--- a/bin/laragon/packages.conf.manifest
+++ b/bin/laragon/packages.conf.manifest
@@ -1,11 +1,11 @@
 # PHP
-php=https://windows.php.net/downloads/releases/php-7.2.13-Win32-VC15-x64.zip 
+php=https://github.com/leokhoa/laragon-packages/releases/download/4.0.9/php-7.3.2-Win32-VC15-x64.zip 

 # Apache
 apache=https://home.apache.org/~steffenal/VC14/binaries/httpd-2.4.37-win64-VC14.zip

 # phpMyAdmin
-*phpmyadmin=https://files.phpmyadmin.net/phpMyAdmin/4.8.3/phpMyAdmin-4.8.3-english.zip  
+*phpmyadmin=https://files.phpmyadmin.net/phpMyAdmin/4.8.5/phpMyAdmin-4.8.5-english.zip  

 # MariaDB 
 # mariadb10.3=https://downloads.mariadb.org/f/mariadb-10.3.10/winx64-packages/mariadb-10.3.10-winx64.zip/from/http%3A//sgp1.mirrors.digitalocean.com/mariadb/?serve
Author	SHA1	Message	Date
LeoKhoa	302447eade	Merge branch 'dev'	2019-02-14 11:27:33 +00:00
LeoKhoa	58c4d827ea	Put packages.conf in usr dir	2019-02-14 11:25:49 +00:00
Leo Khoa	fa9fcd90f8	Merge pull request #64 from leokhoa/dev Allow multiple string placeholder for the 'Quick app' feature	2019-02-14 18:23:07 +07:00
LeoKhoa	dcc49349c0	Allow multiple string placeholder for the 'Quick app' feature	2019-02-14 11:22:30 +00:00
Leo Khoa	a2ab3225a9	Merge pull request #63 from leokhoa/dev Allow multiple string placeholder for the "Quick app" feature	2019-02-14 08:47:31 +07:00
Leo Khoa	fe83b6917c	Allow multiple string placeholder for the "Quick app" feature	2019-02-14 08:47:10 +07:00
Leo Khoa	7d3f5140b6	Merge pull request #60 from leokhoa/dev Dev	2019-02-11 12:12:28 +00:00
Leo Khoa	f9070ccdec	Remove http to https redirection (because it may cause unexpected issues)	2019-02-11 11:45:17 +00:00
Leo Khoa	0a5c169885	Update PHP download url (move to github)	2019-02-11 11:11:12 +00:00
Leo Khoa	1f09bacc99	Add IgnoreList	2019-02-11 08:56:44 +07:00
Leo Khoa	418721a6f3	Force http to https redirection for Apache	2019-02-11 08:55:37 +07:00
Leo Khoa	ad53c1b829	Merge pull request #56 from leokhoa/dev Add a fallback download method for "Quick app" and "Quick add"	2019-01-31 08:42:25 +07:00
Leo Khoa	0b0bc6a455	Reduce filesize	2019-01-31 08:39:37 +07:00
Leo Khoa	c8c5ab4961	Added "DownloadWaitTime" If DownloadWaitTime=0, Laragon will use native method to download.	2019-01-26 09:29:03 +07:00
Leo Khoa	a030544e4d	Fix download issues	2019-01-24 09:42:31 +07:00
Leo Khoa	6a0301d498	Fix download issue	2019-01-14 09:36:47 +07:00
Leo Khoa	ca0f9423fd	Merge pull request #52 from leokhoa/dev Fixed downloading issue with "Quick app"	2018-12-28 15:48:34 +07:00
Leo Khoa	ba32f2413d	Fixed downloading issue with "Quick app"	2018-12-28 15:47:16 +07:00
Leo Khoa	1fa3c0d1b9	Merge pull request #51 from leokhoa/dev Fixed downloading issue with "Quick app"	2018-12-28 09:42:36 +07:00
Leo Khoa	a2d1655fe9	Fixed downloading issue with "Quick app"	2018-12-28 09:41:55 +07:00