DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

PHP 7.1 for all (#5456)

Browse source 
* PHP 7.1 for all

* fedora support. strict versioning.

* Add fedora 26 and 27
This commit is contained in:
tiagom62 2018-05-02 00:02:14 -04:00 committed by snipe
parent 44bb79c90e
commit 28a1960fda
2 changed files with 41 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Vagrantfile vendored
View file

@ -56,13 +56,21 @@ Vagrant.configure("2") do |config|
stretch.vm.provision :shell, :inline => "chmod 755 snipeit.sh" stretch.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
end end
config.vm.define "fedora25" do |fedora25| config.vm.define "fedora27" do |fedora27|
fedora25.vm.box = "fedora/25-cloud-base" fedora27.vm.box = "fedora/27-cloud-base"
fedora25.vm.hostname = 'fedora25' fedora27.vm.hostname = 'fedora27'
fedora25.vm.network "public_network", bridge: NETWORK_BRIDGE fedora27.vm.network "public_network", bridge: NETWORK_BRIDGE
fedora25.vm.provision :shell, :inline => "dnf -y update" fedora27.vm.provision :shell, :inline => "dnf -y install wget"
fedora25.vm.provision :shell, :inline => "dnf -y install wget" fedora27.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
fedora25.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}" fedora27.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
fedora25.vm.provision :shell, :inline => "chmod 755 snipeit.sh" end
config.vm.define "fedora26" do |fedora26|
fedora26.vm.box = "fedora/26-cloud-base"
fedora26.vm.hostname = 'fedora26'
fedora26.vm.network "public_network", bridge: NETWORK_BRIDGE
fedora26.vm.provision :shell, :inline => "dnf -y install wget"
fedora26.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
fedora26.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
end end
end end

43
snipeit.sh
View file

@ -304,19 +304,24 @@ done
case $distro in case $distro in
debian) debian)
if [[ "$version" =~ ^9 ]]; then if [[ "$version" =~ ^9 ]]; then
##################################### Install for Debian 9 ############################################## # Install for Debian 9.x
webdir=/var/www webdir=/var/www
ownergroup=www-data:www-data ownergroup=www-data:www-data
tzone=$(cat /etc/timezone) tzone=$(cat /etc/timezone)
apachefile=/etc/apache2/sites-available/$name.conf apachefile=/etc/apache2/sites-available/$name.conf
echo "* Adding PHP repository."
log "apt-get install -y apt-transport-https"
log "wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg"
echo "deb https://packages.sury.org/php/ $codename main" > /etc/apt/sources.list.d/php.list
echo -n "* Updating installed packages." echo -n "* Updating installed packages."
log "apt-get update" log "apt-get update"
log "apt-get -y upgrade" & pid=$! log "apt-get -y upgrade" & pid=$!
progress progress
echo "* Installing Apache httpd, PHP, MariaDB and other requirements." echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml php-bcmath curl git unzip" PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php7.1 php7.1 php7.1-mcrypt php7.1-curl php7.1-mysql php7.1-gd php7.1-ldap php7.1-zip php7.1-mbstring php7.1-xml php7.1-bcmath curl git unzip"
install_packages install_packages
echo "* Configuring Apache." echo "* Configuring Apache."
@ -334,18 +339,16 @@ case $distro in
echo "* Restarting Apache httpd." echo "* Restarting Apache httpd."
log "service apache2 restart" log "service apache2 restart"
elif [[ "$version" =~ ^8 ]]; then elif [[ "$version" =~ ^8 ]]; then
##################################### Install for Debian 8 ############################################## # Install for Debian 8.x
webdir=/var/www webdir=/var/www
ownergroup=www-data:www-data ownergroup=www-data:www-data
tzone=$(cat /etc/timezone) tzone=$(cat /etc/timezone)
apachefile=/etc/apache2/sites-available/$name.conf apachefile=/etc/apache2/sites-available/$name.conf
echo "* Adding MariaDB and ppa:ondrej/php repositories." echo "* Adding MariaDB and ppa:ondrej/php repositories."
log "apt-get install -y software-properties-common" log "apt-get install -y software-properties-common apt-transport-https"
log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db" log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db"
log "add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/debian $codename main'" log "add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/debian $codename main'"
#PHP7 repository
log "apt-get install -y apt-transport-https"
log "wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg" log "wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg"
echo "deb https://packages.sury.org/php/ $codename main" > /etc/apt/sources.list.d/php.list echo "deb https://packages.sury.org/php/ $codename main" > /etc/apt/sources.list.d/php.list
@ -378,25 +381,25 @@ case $distro in
fi fi
;; ;;
ubuntu) ubuntu)
if [[ "$version" =~ 1[6-7] ]]; then if [[ "$version" =~ 16.04 ]]; then
##################################### Install for Ubuntu 16-17 ############################################## # Install for Ubuntu 16.04
webdir=/var/www webdir=/var/www
ownergroup=www-data:www-data ownergroup=www-data:www-data
tzone=$(cat /etc/timezone) tzone=$(cat /etc/timezone)
apachefile=/etc/apache2/sites-available/$name.conf apachefile=/etc/apache2/sites-available/$name.conf
echo "* Adding MariaDB repository." echo "* Adding MariaDB and ppa:ondrej/php repositories."
log "apt-get install -y software-properties-common" log "apt-get install -y software-properties-common"
log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8" log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8"
log "add-apt-repository 'deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu $codename main'" log "add-apt-repository 'deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu $codename main'"
log "add-apt-repository -y ppa:ondrej/php"
echo -n "* Updating installed packages." echo -n "* Updating installed packages."
log "apt-get update" log "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y upgrade" & pid=$!
log "DEBIAN_FRONTEND=noninteractive apt-get -y upgrade" & pid=$!
progress progress
echo "* Installing Apache httpd, PHP, MariaDB and other requirements." echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml php-bcmath curl git unzip" PACKAGES="mariadb-server mariadb-client apache2 libapache2-mod-php7.1 php7.1 php7.1-mcrypt php7.1-curl php7.1-mysql php7.1-gd php7.1-ldap php7.1-zip php7.1-mbstring php7.1-xml php7.1-bcmath curl git unzip"
install_packages install_packages
echo "* Configuring Apache." echo "* Configuring Apache."
@ -418,8 +421,8 @@ case $distro in
echo "* Restarting Apache httpd." echo "* Restarting Apache httpd."
log "service apache2 restart" log "service apache2 restart"
elif [[ "$version" =~ 14 ]]; then elif [[ "$version" =~ 14.04 ]]; then
##################################### Install for Ubuntu 14 ############################################## # Install for Ubuntu 14.04
webdir=/var/www webdir=/var/www
ownergroup=www-data:www-data ownergroup=www-data:www-data
tzone=$(cat /etc/timezone) tzone=$(cat /etc/timezone)
@ -429,7 +432,6 @@ case $distro in
log "apt-get install -y software-properties-common" log "apt-get install -y software-properties-common"
log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db" log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db"
log "add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu $codename main'" log "add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu $codename main'"
#PHP7 repository
log "add-apt-repository ppa:ondrej/php -y" log "add-apt-repository ppa:ondrej/php -y"
echo -n "* Updating installed packages." echo -n "* Updating installed packages."
@ -467,7 +469,7 @@ case $distro in
;; ;;
centos) centos)
if [[ "$version" =~ ^6 ]]; then if [[ "$version" =~ ^6 ]]; then
##################################### Install for CentOS/Redhat 6 ############################################## # Install for CentOS/Redhat 6.x
webdir=/var/www/html webdir=/var/www/html
ownergroup=apache:apache ownergroup=apache:apache
tzone=$(grep ZONE /etc/sysconfig/clock | tr -d '"' | sed 's/ZONE=//g'); tzone=$(grep ZONE /etc/sysconfig/clock | tr -d '"' | sed 's/ZONE=//g');
@ -518,7 +520,7 @@ case $distro in
log "chkconfig httpd on" log "chkconfig httpd on"
log "/sbin/service httpd start" log "/sbin/service httpd start"
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
ownergroup=apache:apache ownergroup=apache:apache
tzone=$(timedatectl | gawk -F'[: ]' ' $9 ~ /zone/ {print $11}'); tzone=$(timedatectl | gawk -F'[: ]' ' $9 ~ /zone/ {print $11}');
@ -560,7 +562,8 @@ case $distro in
fi fi
;; ;;
fedora) fedora)
##################################### Install for Fedora 25+ ############################################## if [ "$version" -ge 26 ]; then
# Install for Fedora 26+
webdir=/var/www/html webdir=/var/www/html
ownergroup=apache:apache ownergroup=apache:apache
tzone=$(timedatectl | gawk -F'[: ]' ' $9 ~ /zone/ {print $11}'); tzone=$(timedatectl | gawk -F'[: ]' ' $9 ~ /zone/ {print $11}');
@ -591,6 +594,10 @@ case $distro in
echo "* Setting Apache httpd to start on boot and starting service." echo "* Setting Apache httpd to start on boot and starting service."
log "systemctl enable httpd.service" log "systemctl enable httpd.service"
log "systemctl restart httpd.service" log "systemctl restart httpd.service"
else
echo "Unsupported Fedora version. Version found: $version"
exit 1
fi
esac esac
setupmail=default setupmail=default