DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
snipe 2016-09-23 13:14:18 -07:00
parent 2ba4986396 caf6a10227
commit c3cd329604
2 changed files with 62 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/AssetsController.php
View file

@ -231,7 +231,7 @@ class AssetsController extends Controller
$directory= public_path('uploads/assets/'); $directory= public_path('uploads/assets/');
// Check if the uploads directory exists. If not, try to create it. // Check if the uploads directory exists. If not, try to create it.
if (!file_exists($directory)) { if (!file_exists($directory)) {
mkdir($directory, 0755); mkdir($directory, 0755, true);
} }
$path = public_path('uploads/assets/'.$file_name); $path = public_path('uploads/assets/'.$file_name);
try { try {
@ -407,7 +407,7 @@ class AssetsController extends Controller
$directory= public_path('uploads/assets/'); $directory= public_path('uploads/assets/');
// Check if the uploads directory exists. If not, try to create it. // Check if the uploads directory exists. If not, try to create it.
if (!file_exists($directory)) { if (!file_exists($directory)) {
mkdir($directory, 0755); mkdir($directory, 0755, true);
} }
$file_name = str_random(25).".".$extension; $file_name = str_random(25).".".$extension;
@ -840,7 +840,7 @@ class AssetsController extends Controller
// Check if the uploads directory exists. If not, try to create it. // Check if the uploads directory exists. If not, try to create it.
if (!file_exists($path)) { if (!file_exists($path)) {
mkdir($path, 0755); mkdir($path, 0755, true);
} }
if ($handle = opendir($path)) { if ($handle = opendir($path)) {

56
snipeit.sh
View file

@ -31,9 +31,31 @@ file=master.zip
tmp=/tmp/$name tmp=/tmp/$name
fileName=snipe-it-master fileName=snipe-it-master
spin[0]="-"
spin[1]="\\"
spin[2]="|"
spin[3]="/"
rm -rf $tmp/ rm -rf $tmp/
mkdir $tmp mkdir $tmp
# Debian/Ubuntu friendly f(x)
progress () {
while kill -0 $pid > /dev/null 2>&1
do
for i in "${spin[@]}"
do
if [ -e /proc/$pid ]; then
echo -ne "\b$i"
sleep .1
else
echo -ne "\n\n"
fi
done
done
}
function isinstalled { function isinstalled {
if yum list installed "$@" >/dev/null 2>&1; then if yum list installed "$@" >/dev/null 2>&1; then
true true
@ -149,14 +171,17 @@ case $distro in
echo "## Updating Debian packages in the background. Please be patient." echo "## Updating Debian packages in the background. Please be patient."
echo "" echo ""
apachefile=/etc/apache2/sites-available/$name.conf apachefile=/etc/apache2/sites-available/$name.conf
sudo apt-get update >> /var/log/snipeit-install.log 2>&1 sudo apt-get update >> /var/log/snipeit-install.log & pid=$! 2>&1
sudo apt-get -y upgrade >> /var/log/snipeit-install.log 2>&1 progress
sudo apt-get -y upgrade >> /var/log/snipeit-install.log & pid=$! 2>&1
progress
echo "## Installing packages." echo "## Installing packages."
sudo apt-get -y install mariadb-server mariadb-client sudo apt-get -y install mariadb-server mariadb-client
echo "## Going to suppress more messages that you don't need to worry about. Please wait." echo "## Going to suppress more messages that you don't need to worry about. Please wait."
sudo apt-get -y install apache2 >> /var/log/snipeit-install.log 2>&1 sudo apt-get -y install apache2 >> /var/log/snipeit-install.log & pid=$! 2>&1
sudo apt-get install -y git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap libapache2-mod-php5 curl >> /var/log/snipeit-install.log 2>&1 progress
sudo apt-get install -y git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap libapache2-mod-php5 curl >> /var/log/snipeit-install.log & pid=$! 2>&1
progress
# Get files and extract to web dir # Get files and extract to web dir
echo "" echo ""
@ -209,7 +234,6 @@ case $distro in
#Modify the Snipe-It files necessary for a production environment. #Modify the Snipe-It files necessary for a production environment.
echo "## Modify the Snipe-It files necessary for a production environment." echo "## Modify the Snipe-It files necessary for a production environment."
echo "## Securing Mysql" echo "## Securing Mysql"
# Have user set own root password when securing install # Have user set own root password when securing install
# and just set the snipeit database user at the beginning # and just set the snipeit database user at the beginning
@ -250,16 +274,22 @@ case $distro in
echo "" echo ""
echo "## Updating ubuntu in the background. Please be patient." echo "## Updating ubuntu in the background. Please be patient."
echo "" echo ""
echo -n "Updating with apt-get update... ${spin[0]}"
sudo apt-get update >> /var/log/snipeit-install.log & pid=$! 2>&1
progress
echo -n "Upgrading packages with apt-get upgrade... ${spin[0]}"
sudo apt-get -y upgrade >> /var/log/snipeit-install.log & pid=$! 2>&1
progress
apachefile=/etc/apache2/sites-available/$name.conf apachefile=/etc/apache2/sites-available/$name.conf
sudo apt-get update >> /var/log/snipeit-install.log 2>&1
sudo apt-get -y upgrade >> /var/log/snipeit-install.log 2>&1
echo "## Installing packages." echo "## Installing packages."
#We already established MySQL root & user PWs, so we dont need to be prompted. Let's go ahead and install Apache, PHP and MySQL. #We already established MySQL root & user PWs, so we dont need to be prompted. Let's go ahead and install Apache, PHP and MySQL.
echo "## Setting up LAMP." echo "## Setting up LAMP."
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y lamp-server^ >> /var/log/snipeit-install.log 2>&1 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y lamp-server^ >> /var/log/snipeit-install.log & pid=$! 2>&1
echo ""
progress
if [ "$version" == "16.04" ]; then if [ "$version" == "16.04" ]; then
sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml >> /var/log/snipeit-install.log 2>&1
sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-xml php-zip php-mbstring >> /var/log/snipeit-install.log 2>&1 sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-xml php-zip php-mbstring >> /var/log/snipeit-install.log 2>&1
#Enable mcrypt and rewrite #Enable mcrypt and rewrite
echo "## Enabling mcrypt and rewrite" echo "## Enabling mcrypt and rewrite"
@ -282,8 +312,6 @@ case $distro in
## TODO make sure apache is set to start on boot and go ahead and start it ## TODO make sure apache is set to start on boot and go ahead and start it
sudo ls -al /etc/apache2/mods-enabled/rewrite.load >> /var/log/snipeit-install.log 2>&1 sudo ls -al /etc/apache2/mods-enabled/rewrite.load >> /var/log/snipeit-install.log 2>&1
#Create a new virtual host for Apache. #Create a new virtual host for Apache.
@ -305,7 +333,7 @@ case $distro in
echo "## Setting up hosts file." echo "## Setting up hosts file."
echo >> $hosts "127.0.0.1 $hostname $fqdn" echo >> $hosts "127.0.0.1 $hostname $fqdn"
a2ensite $name.conf >> /var/log/snipeit-install.log 2>&1 a2ensite $name.conf >> /var/log/snipeit-install.log
cat > $webdir/$name/.env <<-EOF cat > $webdir/$name/.env <<-EOF
#Created By Snipe-it Installer #Created By Snipe-it Installer
@ -320,7 +348,7 @@ case $distro in
EOF EOF
## TODO make sure mysql is set to start on boot and go ahead and start it ## TODO make sure mysql is set to start on boot and go ahead and start it
echo "## MySQL Phase next."
# Setup Mysql, then run the command. # Setup Mysql, then run the command.
/usr/bin/mysql_secure_installation /usr/bin/mysql_secure_installation
echo "## Creating MySQL Database and user. " echo "## Creating MySQL Database and user. "