DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-13 06:47:46 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2017-08-21 22:31:04 -07:00
parent 6a73ec6537 481143b891
commit afc763ebac
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -13,6 +13,7 @@ php7.0-gd \
php7.0-xml \ php7.0-xml \
php7.0-mbstring \ php7.0-mbstring \
php7.0-zip \ php7.0-zip \
php7.0-bcmath \
patch \ patch \
curl \ curl \
vim \ vim \
@ -23,6 +24,7 @@ mysql-client \
RUN phpenmod mcrypt RUN phpenmod mcrypt
RUN phpenmod gd RUN phpenmod gd
RUN phpenmod bcmath
RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/apache2/php.ini RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/apache2/php.ini
RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/cli/php.ini RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/cli/php.ini

6
snipeit.sh
View file

@ -151,7 +151,7 @@ case $distro in
echo " The installer has detected Debian version $version as the OS." echo " The installer has detected Debian version $version as the OS."
distro=debian distro=debian
;; ;;
*centos*|*redhat*|*ol*) *centos*|*redhat*|*ol*|*rhel*)
echo " The installer has detected $distro version $version as the OS." echo " The installer has detected $distro version $version as the OS."
distro=centos distro=centos
;; ;;
@ -292,7 +292,7 @@ case $distro in
service apache2 restart service apache2 restart
;; ;;
centos ) centos )
if [ "$version" == "6" ]; then if [[ "$version" =~ ^6 ]]; then
##################################### Install for Centos/Redhat 6 ############################################## ##################################### Install for Centos/Redhat 6 ##############################################
webdir=/var/www/html webdir=/var/www/html
@ -409,7 +409,7 @@ case $distro in
service httpd restart service httpd restart
elif [ "$version" == "7" ]; then elif [[ "$version" =~ ^7 ]]; then
##################################### Install for Centos/Redhat 7 ############################################## ##################################### Install for Centos/Redhat 7 ##############################################
webdir=/var/www/html webdir=/var/www/html