mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-26 06:04:08 -08:00
Merge branch 'develop'
This commit is contained in:
snipe
commit
aa5003d297
4
.github/stale.yml
vendored
4
.github/stale.yml
vendored
|
|
@ -9,6 +9,10 @@ exemptLabels:
|
|||
- :woman_technologist: ready for dev
|
||||
- :moneybag: bounty
|
||||
- :hand: bug
|
||||
- "🔐 security"
|
||||
- "👩💻 ready for dev"
|
||||
- "💰 bounty"
|
||||
- "✋ bug"
|
||||
# Label to use when marking an issue as stale
|
||||
staleLabel: stale
|
||||
# Comment to post when marking an issue as stale. Set to `false` to disable
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ patch \
|
|||
curl \
|
||||
vim \
|
||||
git \
|
||||
cron \
|
||||
mysql-client \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||
|
|
|
|||
8
Vagrantfile
vendored
8
Vagrantfile
vendored
|
|
@ -5,6 +5,14 @@ SNIPEIT_SH_URL= "https://raw.githubusercontent.com/snipe/snipe-it/master/snipeit
|
|||
NETWORK_BRIDGE= "en0: Wi-Fi (AirPort)"
|
||||
|
||||
Vagrant.configure("2") do |config|
|
||||
config.vm.define "bionic" do |bionic|
|
||||
bionic.vm.box = "ubuntu/bionic64"
|
||||
bionic.vm.hostname = 'bionic'
|
||||
bionic.vm.network "public_network", bridge: NETWORK_BRIDGE
|
||||
bionic.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
|
||||
bionic.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
|
||||
end
|
||||
|
||||
config.vm.define "xenial" do |xenial|
|
||||
xenial.vm.box = "ubuntu/xenial64"
|
||||
xenial.vm.hostname = 'xenial'
|
||||
|
|
|
|||
|
|
@ -396,6 +396,7 @@ class SettingsController extends Controller
|
|||
$setting->brand = $request->input('brand', '1');
|
||||
$setting->header_color = $request->input('header_color');
|
||||
$setting->support_footer = $request->input('support_footer');
|
||||
$setting->version_footer = $request->input('version_footer');
|
||||
$setting->footer_text = $request->input('footer_text');
|
||||
$setting->skin = $request->input('skin');
|
||||
$setting->show_url_in_emails = $request->input('show_url_in_emails', '0');
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ class UserImporter extends ItemImporter
|
|||
$this->item['phone'] = $this->findCsvMatch($row, 'phone_number');
|
||||
$this->item['jobtitle'] = $this->findCsvMatch($row, 'jobtitle');
|
||||
$this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num');
|
||||
$this->item['password'] = $this->tempPassword;
|
||||
$user = User::where('username', $this->item['username'])->first();
|
||||
if ($user) {
|
||||
if (!$this->updating) {
|
||||
|
|
@ -45,11 +44,14 @@ class UserImporter extends ItemImporter
|
|||
return;
|
||||
}
|
||||
$this->log('Updating User');
|
||||
// $user = $this->users[$userId];
|
||||
$user->update($this->sanitizeItemForUpdating($user));
|
||||
$user->save();
|
||||
return;
|
||||
}
|
||||
// This needs to be applied after the update logic, otherwise we'll overwrite user passwords
|
||||
// Issue #5408
|
||||
$this->item['password'] = $this->tempPassword;
|
||||
|
||||
$this->log("No matching user, creating one");
|
||||
$user = new User();
|
||||
$user->fill($this->sanitizeItemForStoring($user));
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ class AssetModel extends SnipeModel
|
|||
* @param $query
|
||||
*
|
||||
* @return $query
|
||||
* @author Daniel Meltzer <parallelgrapefruit@gmail.com
|
||||
* @author Daniel Meltzer <dmeltzer.devel@gmail.com>
|
||||
* @version v3.5
|
||||
*/
|
||||
public function scopeRequestableModels($query)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ trait Loggable
|
|||
{
|
||||
|
||||
/**
|
||||
* @author Daniel Meltzer <parallelgrapefruit@gmail.com
|
||||
* @author Daniel Meltzer <dmeltzer.devel@gmail.com>
|
||||
* @since [v3.4]
|
||||
* @return \App\Models\Actionlog
|
||||
*/
|
||||
|
|
@ -32,7 +32,7 @@ trait Loggable
|
|||
}
|
||||
|
||||
/**
|
||||
* @author Daniel Meltzer <parallelgrapefruit@gmail.com
|
||||
* @author Daniel Meltzer <dmeltzer.devel@gmail.com>
|
||||
* @since [v3.4]
|
||||
* @return \App\Models\Actionlog
|
||||
*/
|
||||
|
|
@ -106,7 +106,7 @@ trait Loggable
|
|||
return $log;
|
||||
}
|
||||
/**
|
||||
* @author Daniel Meltzer <parallelgrapefruit@gmail.com
|
||||
* @author Daniel Meltzer <dmeltzer.devel@gmail.com>
|
||||
* @since [v3.4]
|
||||
* @return \App\Models\Actionlog
|
||||
*/
|
||||
|
|
@ -204,7 +204,7 @@ trait Loggable
|
|||
|
||||
|
||||
/**
|
||||
* @author Daniel Meltzer <parallelgrapefruit@gmail.com
|
||||
* @author Daniel Meltzer <dmeltzer.devel@gmail.com>
|
||||
* @since [v3.5]
|
||||
* @return \App\Models\Actionlog
|
||||
*/
|
||||
|
|
@ -231,7 +231,7 @@ trait Loggable
|
|||
}
|
||||
|
||||
/**
|
||||
* @author Daniel Meltzer <parallelgrapefruit@gmail.com
|
||||
* @author Daniel Meltzer <dmeltzer.devel@gmail.com>
|
||||
* @since [v3.4]
|
||||
* @return \App\Models\Actionlog
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,11 +1,4 @@
|
|||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: parallelgrapefruit
|
||||
* Date: 12/23/16
|
||||
* Time: 11:51 AM
|
||||
*/
|
||||
|
||||
namespace App\Presenters;
|
||||
|
||||
use App\Helpers\Helper;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: parallelgrapefruit
|
||||
* Date: 12/23/16
|
||||
* Time: 12:15 PM
|
||||
*/
|
||||
|
||||
namespace App\Presenters;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: parallelgrapefruit
|
||||
* Date: 12/23/16
|
||||
* Time: 12:15 PM
|
||||
*/
|
||||
|
||||
namespace App\Presenters;
|
||||
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@
|
|||
"preferred-install": "dist",
|
||||
"sort-packages": true,
|
||||
"optimize-autoloader": true,
|
||||
"process-timeout":3000,
|
||||
"platform": {
|
||||
"php": "5.6.4"
|
||||
}
|
||||
|
|
|
|||
29
database/migrations/2018_06_21_134622_add_version_footer.php
Executable file
29
database/migrations/2018_06_21_134622_add_version_footer.php
Executable file
|
|
@ -0,0 +1,29 @@
|
|||
<?php
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
class AddVersionFooter extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function up()
|
||||
{
|
||||
Schema::table('settings', function (Blueprint $table) {
|
||||
$table->char('version_footer', 5)->nullable()->default('on');
|
||||
});
|
||||
}
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function down()
|
||||
{
|
||||
Schema::table('settings', function (Blueprint $table) {
|
||||
$table->dropColumn('version_footer');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -121,7 +121,9 @@ return array(
|
|||
'slack_test_help' => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
|
||||
'snipe_version' => 'Snipe-IT version',
|
||||
'support_footer' => 'Support Footer Links ',
|
||||
'support_footer_help' => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
|
||||
'support_footer_help' => 'Specify who sees the links to the Snipe-IT Support info and Users Manual.',
|
||||
'version_footer' => 'Version in Footer ',
|
||||
'version_footer_help' => 'Specify who sees the Snipe-IT version and build number.',
|
||||
'system' => 'System Information',
|
||||
'update' => 'Update Settings',
|
||||
'value' => 'Value',
|
||||
|
|
|
|||
|
|
@ -366,12 +366,14 @@ Form::macro('date_display_format', function ($name = "date_display_format", $sel
|
|||
'd M, Y',
|
||||
'm/d/Y',
|
||||
'n/d/y',
|
||||
'd/m/Y',
|
||||
'm/j/Y',
|
||||
'd.m.Y',
|
||||
];
|
||||
|
||||
foreach ($formats as $format) {
|
||||
$date_display_formats[$format] = Carbon::now()->format($format);
|
||||
|
||||
$date_display_formats[$format] = Carbon::parse(date('Y').'-'.date('m').'-25')->format($format);
|
||||
}
|
||||
$select = '<select name="'.$name.'" class="'.$class.'" style="min-width:250px">';
|
||||
foreach ($date_display_formats as $format => $date_display_format) {
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
<td>{{ $license->name }}</td>
|
||||
<td>
|
||||
@can('viewKeys', $license)
|
||||
{{ mb_strimwidth($license->serial, 0, 50, "...") }}
|
||||
{{ $license->serial }}
|
||||
@else
|
||||
------------
|
||||
@endcan
|
||||
|
|
@ -205,7 +205,7 @@ View Assets for {{ $user->present()->fullName() }}
|
|||
@endif
|
||||
|
||||
<div class="box-body">
|
||||
<!-- checked out licenses table -->
|
||||
<!-- checked out Accessories table -->
|
||||
|
||||
<div class="table-responsive">
|
||||
<table
|
||||
|
|
|
|||
|
|
@ -605,6 +605,8 @@
|
|||
<tbody>
|
||||
<?php $totalCost = 0; ?>
|
||||
@foreach ($asset->components as $component)
|
||||
|
||||
|
||||
@if (is_null($component->deleted_at))
|
||||
<tr>
|
||||
<td>
|
||||
|
|
@ -612,6 +614,7 @@
|
|||
</td>
|
||||
<td>{{ $component->pivot->assigned_qty }}</td>
|
||||
<td>{{ $component->purchase_cost }}</td>
|
||||
<?php $totalCost = $totalCost + $component->purchase_cost ;?>
|
||||
|
||||
</tr>
|
||||
@endif
|
||||
|
|
@ -620,7 +623,9 @@
|
|||
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="7" class="text-right">{{ $use_currency.$totalCost }}</td>
|
||||
<td colspan="2">
|
||||
</td>
|
||||
<td>{{ $totalCost }}</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -741,7 +741,11 @@
|
|||
<footer class="main-footer hidden-print">
|
||||
|
||||
<div class="pull-right hidden-xs">
|
||||
<b>Version</b> {{ config('version.app_version') }} - build {{ config('version.build_version') }} ({{ config('version.branch') }})
|
||||
@if ($snipeSettings->version_footer!='off')
|
||||
@if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
|
||||
<b>Version</b> {{ config('version.app_version') }} - build {{ config('version.build_version') }} ({{ config('version.branch') }})
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if ($snipeSettings->support_footer!='off')
|
||||
@if (($snipeSettings->support_footer=='on') || (($snipeSettings->support_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
|
||||
|
|
|
|||
|
|
@ -168,6 +168,24 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Version Footer -->
|
||||
<div class="form-group {{ $errors->has('version_footer') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
{{ Form::label('version_footer', trans('admin/settings/general.version_footer')) }}
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@if (config('app.lock_passwords')===true)
|
||||
{!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('version_footer', $setting->version_footer), ['class' => 'form-control disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
|
||||
@else
|
||||
{!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('version_footer', $setting->version_footer), array('class' => 'form-control', 'style'=>'width: 150px ;')) !!}
|
||||
@endif
|
||||
|
||||
<p class="help-block">{{ trans('admin/settings/general.version_footer_help') }}</p>
|
||||
{!! $errors->first('version_footer', '<span class="alert-msg">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Additional footer -->
|
||||
<div class="form-group {{ $errors->has('footer_text') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
|
|
|
|||
230
snipeit.sh
230
snipeit.sh
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/bash
|
||||
#/ Usage: sniepit [-vh]
|
||||
#/ Usage: snipeit.sh [-vh]
|
||||
#/
|
||||
#/ Install Snipe-IT open source asset management.
|
||||
#/
|
||||
|
|
@ -11,10 +11,6 @@
|
|||
# Snipe-It Install Script #
|
||||
# Script created by Mike Tucker #
|
||||
# mtucker6784@gmail.com #
|
||||
# This script is just to help streamline the #
|
||||
# install process for Debian and CentOS #
|
||||
# based distributions. I assume you will be #
|
||||
# installing as a subdomain on a fresh OS install. #
|
||||
# #
|
||||
# Feel free to modify, but please give #
|
||||
# credit where it's due. Thanks! #
|
||||
|
|
@ -44,7 +40,7 @@ done
|
|||
|
||||
print_usage () {
|
||||
grep '^#/' <"$0" | cut -c 4-
|
||||
exit ${1:-1}
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [ -n "$show_help" ]; then
|
||||
|
|
@ -67,12 +63,11 @@ if [ "$(id -u)" != "0" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
#First things first, let's set some variables and find our distro.
|
||||
clear
|
||||
|
||||
name="snipeit"
|
||||
hostname="$(hostname)"
|
||||
fqdn="$(hostname --fqdn)"
|
||||
readonly APP_USER="snipeitapp"
|
||||
readonly APP_NAME="snipeit"
|
||||
readonly APP_PATH="/var/www/$APP_NAME"
|
||||
|
||||
progress () {
|
||||
spin[0]="-"
|
||||
|
|
@ -84,7 +79,7 @@ progress () {
|
|||
while kill -0 "$pid" > /dev/null 2>&1; do
|
||||
for i in "${spin[@]}"; do
|
||||
echo -ne "\\b$i"
|
||||
sleep .1
|
||||
sleep .3
|
||||
done
|
||||
done
|
||||
echo ""
|
||||
|
|
@ -136,58 +131,103 @@ install_packages () {
|
|||
create_virtualhost () {
|
||||
{
|
||||
echo "<VirtualHost *:80>"
|
||||
echo " <Directory $webdir/$name/public>"
|
||||
echo " <Directory $APP_PATH/public>"
|
||||
echo " Allow From All"
|
||||
echo " AllowOverride All"
|
||||
echo " Options +Indexes"
|
||||
echo " </Directory>"
|
||||
echo ""
|
||||
echo " DocumentRoot $webdir/$name/public"
|
||||
echo " DocumentRoot $APP_PATH/public"
|
||||
echo " ServerName $fqdn"
|
||||
echo "</VirtualHost>"
|
||||
} >> "$apachefile"
|
||||
}
|
||||
|
||||
create_user () {
|
||||
echo "* Creating Snipe-IT user."
|
||||
|
||||
if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ] ; then
|
||||
adduser --quiet --disabled-password --gecos '""' "$APP_USER"
|
||||
else
|
||||
adduser "$APP_USER"
|
||||
fi
|
||||
|
||||
usermod -a -G "$apache_group" "$APP_USER"
|
||||
}
|
||||
|
||||
run_as_app_user () {
|
||||
if ! hash sudo 2>/dev/null; then
|
||||
su -c "$@" $APP_USER
|
||||
else
|
||||
sudo -i -u $APP_USER "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
install_composer () {
|
||||
# https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md
|
||||
EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)"
|
||||
run_as_app_user php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
|
||||
ACTUAL_SIGNATURE="$(run_as_app_user php -r "echo hash_file('SHA384', 'composer-setup.php');")"
|
||||
|
||||
if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]
|
||||
then
|
||||
>&2 echo 'ERROR: Invalid composer installer signature'
|
||||
run_as_app_user rm composer-setup.php
|
||||
exit 1
|
||||
fi
|
||||
|
||||
run_as_app_user php composer-setup.php
|
||||
run_as_app_user rm composer-setup.php
|
||||
|
||||
mv "$(eval echo ~$APP_USER)"/composer.phar /usr/local/bin/composer
|
||||
}
|
||||
|
||||
install_snipeit () {
|
||||
create_user
|
||||
|
||||
echo "* Creating MariaDB Database/User."
|
||||
echo "* Please Input your MariaDB root password:"
|
||||
mysql -u root -p --execute="CREATE DATABASE snipeit;GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';"
|
||||
|
||||
echo "* Cloning Snipe-IT from github to the web directory."
|
||||
log "git clone https://github.com/snipe/snipe-it $webdir/$name"
|
||||
log "git clone https://github.com/snipe/snipe-it $APP_PATH"
|
||||
|
||||
echo "* Configuring .env file."
|
||||
cp "$webdir/$name/.env.example" "$webdir/$name/.env"
|
||||
cp "$APP_PATH/.env.example" "$APP_PATH/.env"
|
||||
|
||||
#TODO escape SED delimiter in variables
|
||||
sed -i '1 i\#Created By Snipe-it Installer' "$webdir/$name/.env"
|
||||
sed -i "s|^\\(APP_TIMEZONE=\\).*|\\1$tzone|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(DB_HOST=\\).*|\\1localhost|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(DB_DATABASE=\\).*|\\1snipeit|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(DB_USERNAME=\\).*|\\1snipeit|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(DB_PASSWORD=\\).*|\\1$mysqluserpw|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(APP_URL=\\).*|\\1http://$fqdn|" "$webdir/$name/.env"
|
||||
sed -i '1 i\#Created By Snipe-it Installer' "$APP_PATH/.env"
|
||||
sed -i "s|^\\(APP_TIMEZONE=\\).*|\\1$tzone|" "$APP_PATH/.env"
|
||||
sed -i "s|^\\(DB_HOST=\\).*|\\1localhost|" "$APP_PATH/.env"
|
||||
sed -i "s|^\\(DB_DATABASE=\\).*|\\1snipeit|" "$APP_PATH/.env"
|
||||
sed -i "s|^\\(DB_USERNAME=\\).*|\\1snipeit|" "$APP_PATH/.env"
|
||||
sed -i "s|^\\(DB_PASSWORD=\\).*|\\1$mysqluserpw|" "$APP_PATH/.env"
|
||||
sed -i "s|^\\(APP_URL=\\).*|\\1http://$fqdn|" "$APP_PATH/.env"
|
||||
|
||||
echo "* Installing and running composer."
|
||||
cd "$webdir/$name/"
|
||||
curl -sS https://getcomposer.org/installer | php
|
||||
php composer.phar install --no-dev --prefer-source
|
||||
echo "* Installing composer."
|
||||
install_composer
|
||||
|
||||
echo "* Setting permissions."
|
||||
for chmod_dir in "$webdir/$name/storage" "$webdir/$name/storage/private_uploads" "$webdir/$name/public/uploads"; do
|
||||
chmod -R 755 "$chmod_dir"
|
||||
for chmod_dir in "$APP_PATH/storage" "$APP_PATH/public/uploads"; do
|
||||
chmod -R 775 "$chmod_dir"
|
||||
done
|
||||
|
||||
chown -R "$ownergroup" "$webdir/$name"
|
||||
chown -R "$APP_USER":"$apache_group" "$APP_PATH"
|
||||
|
||||
echo "* Running composer."
|
||||
# We specify the path to composer because CentOS lacks /usr/local/bin in $PATH when using sudo
|
||||
run_as_app_user /usr/local/bin/composer install --no-dev --prefer-source --working-dir "$APP_PATH"
|
||||
|
||||
sudo chgrp -R "$apache_group" "$APP_PATH/vendor"
|
||||
|
||||
echo "* Generating the application key."
|
||||
log "php artisan key:generate --force"
|
||||
log "php $APP_PATH/artisan key:generate --force"
|
||||
|
||||
echo "* Artisan Migrate."
|
||||
log "php artisan migrate --force"
|
||||
log "php $APP_PATH/artisan migrate --force"
|
||||
|
||||
echo "* Creating scheduler cron."
|
||||
(crontab -l ; echo "* * * * * /usr/bin/php $webdir/$name/artisan schedule:run >> /dev/null 2>&1") | crontab -
|
||||
(crontab -l ; echo "* * * * * /usr/bin/php $APP_PATH/artisan schedule:run >> /dev/null 2>&1") | crontab -
|
||||
}
|
||||
|
||||
set_firewall () {
|
||||
|
|
@ -205,13 +245,14 @@ set_selinux () {
|
|||
#Required for ldap integration
|
||||
setsebool -P httpd_can_connect_ldap on
|
||||
#Sets SELinux context type so that scripts running in the web server process are allowed read/write access
|
||||
chcon -R -h -t httpd_sys_script_rw_t "$webdir/$name/"
|
||||
chcon -R -h -t httpd_sys_rw_content_t "$APP_PATH/storage/"
|
||||
chcon -R -h -t httpd_sys_rw_content_t "$APP_PATH/public/"
|
||||
fi
|
||||
}
|
||||
|
||||
set_hosts () {
|
||||
echo "* Setting up hosts file."
|
||||
echo >> /etc/hosts "127.0.0.1 $hostname $fqdn"
|
||||
echo >> /etc/hosts "127.0.0.1 $(hostname) $fqdn"
|
||||
}
|
||||
|
||||
if [[ -f /etc/lsb-release || -f /etc/debian_version ]]; then
|
||||
|
|
@ -219,27 +260,29 @@ if [[ -f /etc/lsb-release || -f /etc/debian_version ]]; then
|
|||
version="$(lsb_release -rs)"
|
||||
codename="$(lsb_release -cs)"
|
||||
elif [ -f /etc/os-release ]; then
|
||||
distro="$(. /etc/os-release && echo $ID)"
|
||||
version="$(. /etc/os-release && echo $VERSION_ID)"
|
||||
# shellcheck disable=SC1091
|
||||
distro="$(source /etc/os-release && echo "$ID")"
|
||||
# shellcheck disable=SC1091
|
||||
version="$(source /etc/os-release && echo "$VERSION_ID")"
|
||||
#Order is important here. If /etc/os-release and /etc/centos-release exist, we're on centos 7.
|
||||
#If only /etc/centos-release exist, we're on centos6(or earlier). Centos-release is less parsable,
|
||||
#so lets assume that it's version 6 (Plus, who would be doing a new install of anything on centos5 at this point..)
|
||||
#/etc/os-release properly detects fedora
|
||||
elif [ -f /etc/centos-release ]; then
|
||||
distro="Centos"
|
||||
distro="centos"
|
||||
version="6"
|
||||
else
|
||||
distro="unsupported"
|
||||
fi
|
||||
|
||||
echo "
|
||||
echo '
|
||||
_____ _ __________
|
||||
/ ___/____ (_)___ ___ / _/_ __/
|
||||
\__ \/ __ \/ / __ \/ _ \______ / / / /
|
||||
___/ / / / / / /_/ / __/_____// / / /
|
||||
/____/_/ /_/_/ .___/\___/ /___/ /_/
|
||||
/_/
|
||||
"
|
||||
'
|
||||
|
||||
echo ""
|
||||
echo " Welcome to Snipe-IT Inventory Installer for CentOS, Fedora, Debian and Ubuntu!"
|
||||
|
|
@ -249,30 +292,38 @@ case $distro in
|
|||
*ubuntu*)
|
||||
echo " The installer has detected $distro version $version codename $codename."
|
||||
distro=ubuntu
|
||||
apache_group=www-data
|
||||
apachefile=/etc/apache2/sites-available/$APP_NAME.conf
|
||||
;;
|
||||
*debian*)
|
||||
echo " The installer has detected $distro version $version codename $codename."
|
||||
distro=debian
|
||||
apache_group=www-data
|
||||
apachefile=/etc/apache2/sites-available/$APP_NAME.conf
|
||||
;;
|
||||
*centos*|*redhat*|*ol*|*rhel*)
|
||||
echo " The installer has detected $distro version $version."
|
||||
distro=centos
|
||||
apache_group=apache
|
||||
apachefile=/etc/httpd/conf.d/$APP_NAME.conf
|
||||
;;
|
||||
*fedora*)
|
||||
echo " The installer has detected $distro version $version."
|
||||
distro=fedora
|
||||
apache_group=apache
|
||||
apachefile=/etc/httpd/conf.d/$APP_NAME.conf
|
||||
;;
|
||||
*)
|
||||
echo " The installer was unable to determine your OS. Exiting for safety."
|
||||
exit
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
shopt -u nocasematch
|
||||
|
||||
echo -n " Q. What is the FQDN of your server? ($fqdn): "
|
||||
echo -n " Q. What is the FQDN of your server? ($(hostname --fqdn)): "
|
||||
read -r fqdn
|
||||
if [ -z "$fqdn" ]; then
|
||||
fqdn="$(hostname --fqdn)"
|
||||
readonly fqdn="$(hostname --fqdn)"
|
||||
fi
|
||||
echo " Setting to $fqdn"
|
||||
echo ""
|
||||
|
|
@ -299,16 +350,11 @@ case $setpw in
|
|||
esac
|
||||
done
|
||||
|
||||
#TODO: Lets not install snipeit application under root
|
||||
|
||||
case $distro in
|
||||
debian)
|
||||
if [[ "$version" =~ ^9 ]]; then
|
||||
# Install for Debian 9.x
|
||||
webdir=/var/www
|
||||
ownergroup=www-data:www-data
|
||||
tzone=$(cat /etc/timezone)
|
||||
apachefile=/etc/apache2/sites-available/$name.conf
|
||||
|
||||
echo "* Adding PHP repository."
|
||||
log "apt-get install -y apt-transport-https"
|
||||
|
|
@ -316,8 +362,7 @@ case $distro in
|
|||
echo "deb https://packages.sury.org/php/ $codename main" > /etc/apt/sources.list.d/php.list
|
||||
|
||||
echo -n "* Updating installed packages."
|
||||
log "apt-get update"
|
||||
log "apt-get -y upgrade" & pid=$!
|
||||
log "apt-get update && apt-get -y upgrade" & pid=$!
|
||||
progress
|
||||
|
||||
echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
|
||||
|
|
@ -327,7 +372,7 @@ case $distro in
|
|||
echo "* Configuring Apache."
|
||||
create_virtualhost
|
||||
log "a2enmod rewrite"
|
||||
log "a2ensite $name.conf"
|
||||
log "a2ensite $APP_NAME.conf"
|
||||
|
||||
set_hosts
|
||||
|
||||
|
|
@ -340,10 +385,7 @@ case $distro in
|
|||
log "service apache2 restart"
|
||||
elif [[ "$version" =~ ^8 ]]; then
|
||||
# Install for Debian 8.x
|
||||
webdir=/var/www
|
||||
ownergroup=www-data:www-data
|
||||
tzone=$(cat /etc/timezone)
|
||||
apachefile=/etc/apache2/sites-available/$name.conf
|
||||
|
||||
echo "* Adding MariaDB and ppa:ondrej/php repositories."
|
||||
log "apt-get install -y software-properties-common apt-transport-https"
|
||||
|
|
@ -353,8 +395,7 @@ case $distro in
|
|||
echo "deb https://packages.sury.org/php/ $codename main" > /etc/apt/sources.list.d/php.list
|
||||
|
||||
echo -n "* Updating installed packages."
|
||||
log "apt-get update"
|
||||
log "apt-get -y upgrade" & pid=$!
|
||||
log "apt-get update && apt-get -y upgrade" & pid=$!
|
||||
progress
|
||||
|
||||
echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
|
||||
|
|
@ -364,7 +405,7 @@ case $distro in
|
|||
echo "* Configuring Apache."
|
||||
create_virtualhost
|
||||
log "a2enmod rewrite"
|
||||
log "a2ensite $name.conf"
|
||||
log "a2ensite $APP_NAME.conf"
|
||||
|
||||
set_hosts
|
||||
|
||||
|
|
@ -381,12 +422,40 @@ case $distro in
|
|||
fi
|
||||
;;
|
||||
ubuntu)
|
||||
if [[ "$version" =~ 16.04 ]]; then
|
||||
# Install for Ubuntu 16.04
|
||||
webdir=/var/www
|
||||
ownergroup=www-data:www-data
|
||||
if [ "$version" == "18.04" ]; then
|
||||
# Install for Ubuntu 18.04
|
||||
tzone=$(cat /etc/timezone)
|
||||
|
||||
echo -n "* Updating installed packages."
|
||||
log "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y upgrade" & pid=$!
|
||||
progress
|
||||
|
||||
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"
|
||||
install_packages
|
||||
|
||||
echo "* Configuring Apache."
|
||||
create_virtualhost
|
||||
log "phpenmod mcrypt"
|
||||
log "phpenmod mbstring"
|
||||
log "a2enmod rewrite"
|
||||
log "a2ensite $APP_NAME.conf"
|
||||
|
||||
set_hosts
|
||||
|
||||
echo "* Starting MariaDB."
|
||||
log "systemctl start mariadb.service"
|
||||
|
||||
echo "* Securing MariaDB."
|
||||
/usr/bin/mysql_secure_installation
|
||||
|
||||
install_snipeit
|
||||
|
||||
echo "* Restarting Apache httpd."
|
||||
log "systemctl restart apache2"
|
||||
elif [ "$version" == "16.04" ]; then
|
||||
# Install for Ubuntu 16.04
|
||||
tzone=$(cat /etc/timezone)
|
||||
apachefile=/etc/apache2/sites-available/$name.conf
|
||||
|
||||
echo "* Adding MariaDB and ppa:ondrej/php repositories."
|
||||
log "apt-get install -y software-properties-common"
|
||||
|
|
@ -407,7 +476,7 @@ case $distro in
|
|||
log "phpenmod mcrypt"
|
||||
log "phpenmod mbstring"
|
||||
log "a2enmod rewrite"
|
||||
log "a2ensite $name.conf"
|
||||
log "a2ensite $APP_NAME.conf"
|
||||
|
||||
set_hosts
|
||||
|
||||
|
|
@ -421,12 +490,9 @@ case $distro in
|
|||
|
||||
echo "* Restarting Apache httpd."
|
||||
log "service apache2 restart"
|
||||
elif [[ "$version" =~ 14.04 ]]; then
|
||||
elif [ "$version" == "14.04" ]; then
|
||||
# Install for Ubuntu 14.04
|
||||
webdir=/var/www
|
||||
ownergroup=www-data:www-data
|
||||
tzone=$(cat /etc/timezone)
|
||||
apachefile=/etc/apache2/sites-available/$name.conf
|
||||
|
||||
echo "* Adding MariaDB and ppa:ondrej/php repositories."
|
||||
log "apt-get install -y software-properties-common"
|
||||
|
|
@ -435,8 +501,7 @@ case $distro in
|
|||
log "add-apt-repository ppa:ondrej/php -y"
|
||||
|
||||
echo -n "* Updating installed packages."
|
||||
log "apt-get update"
|
||||
log "DEBIAN_FRONTEND=noninteractive apt-get -y upgrade" & pid=$!
|
||||
log "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y upgrade" & pid=$!
|
||||
progress
|
||||
|
||||
echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
|
||||
|
|
@ -448,7 +513,7 @@ case $distro in
|
|||
log "phpenmod mcrypt"
|
||||
log "phpenmod mbstring"
|
||||
log "a2enmod rewrite"
|
||||
log "a2ensite $name.conf"
|
||||
log "a2ensite $APP_NAME.conf"
|
||||
|
||||
set_hosts
|
||||
|
||||
|
|
@ -470,10 +535,7 @@ case $distro in
|
|||
centos)
|
||||
if [[ "$version" =~ ^6 ]]; then
|
||||
# Install for CentOS/Redhat 6.x
|
||||
webdir=/var/www/html
|
||||
ownergroup=apache:apache
|
||||
tzone=$(grep ZONE /etc/sysconfig/clock | tr -d '"' | sed 's/ZONE=//g');
|
||||
apachefile=/etc/httpd/conf.d/$name.conf
|
||||
|
||||
echo "* Adding IUS, epel-release and MariaDB repositories."
|
||||
mariadbRepo=/etc/yum.repos.d/MariaDB.repo
|
||||
|
|
@ -521,10 +583,7 @@ case $distro in
|
|||
log "/sbin/service httpd start"
|
||||
elif [[ "$version" =~ ^7 ]]; then
|
||||
# Install for CentOS/Redhat 7
|
||||
webdir=/var/www/html
|
||||
ownergroup=apache:apache
|
||||
tzone=$(timedatectl | gawk -F'[: ]' ' $9 ~ /zone/ {print $11}');
|
||||
apachefile=/etc/httpd/conf.d/$name.conf
|
||||
|
||||
echo "* Adding IUS, epel-release and MariaDB repositories."
|
||||
log "yum -y install wget epel-release"
|
||||
|
|
@ -564,10 +623,7 @@ case $distro in
|
|||
fedora)
|
||||
if [ "$version" -ge 26 ]; then
|
||||
# Install for Fedora 26+
|
||||
webdir=/var/www/html
|
||||
ownergroup=apache:apache
|
||||
tzone=$(timedatectl | gawk -F'[: ]' ' $9 ~ /zone/ {print $11}');
|
||||
apachefile=/etc/httpd/conf.d/$name.conf
|
||||
|
||||
echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
|
||||
PACKAGES="httpd mariadb-server git unzip php php-mysqlnd php-bcmath php-cli php-common php-embedded php-gd php-mbstring php-mcrypt php-ldap php-json php-simplexml"
|
||||
|
|
@ -609,40 +665,40 @@ case $setupmail in
|
|||
[yY] | [yY][Ee][Ss] )
|
||||
echo -n " Outgoing mailserver address:"
|
||||
read -r mailhost
|
||||
sed -i "s|^\\(MAIL_HOST=\\).*|\\1$mailhost|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(MAIL_HOST=\\).*|\\1$mailhost|" "$APP_PATH/.env"
|
||||
|
||||
echo -n " Server port number:"
|
||||
read -r mailport
|
||||
sed -i "s|^\\(MAIL_PORT=\\).*|\\1$mailport|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(MAIL_PORT=\\).*|\\1$mailport|" "$APP_PATH/.env"
|
||||
|
||||
echo -n " Username:"
|
||||
read -r mailusername
|
||||
sed -i "s|^\\(MAIL_USERNAME=\\).*|\\1$mailusername|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(MAIL_USERNAME=\\).*|\\1$mailusername|" "$APP_PATH/.env"
|
||||
|
||||
echo -n " Password:"
|
||||
read -rs mailpassword
|
||||
sed -i "s|^\\(MAIL_PASSWORD=\\).*|\\1$mailpassword|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(MAIL_PASSWORD=\\).*|\\1$mailpassword|" "$APP_PATH/.env"
|
||||
echo ""
|
||||
|
||||
echo -n " Encryption(null/TLS/SSL):"
|
||||
read -r mailencryption
|
||||
sed -i "s|^\\(MAIL_ENCRYPTION=\\).*|\\1$mailencryption|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(MAIL_ENCRYPTION=\\).*|\\1$mailencryption|" "$APP_PATH/.env"
|
||||
|
||||
echo -n " From address:"
|
||||
read -r mailfromaddr
|
||||
sed -i "s|^\\(MAIL_FROM_ADDR=\\).*|\\1$mailfromaddr|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(MAIL_FROM_ADDR=\\).*|\\1$mailfromaddr|" "$APP_PATH/.env"
|
||||
|
||||
echo -n " From name:"
|
||||
read -r mailfromname
|
||||
sed -i "s|^\\(MAIL_FROM_NAME=\\).*|\\1$mailfromname|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(MAIL_FROM_NAME=\\).*|\\1$mailfromname|" "$APP_PATH/.env"
|
||||
|
||||
echo -n " Reply to address:"
|
||||
read -r mailreplytoaddr
|
||||
sed -i "s|^\\(MAIL_REPLYTO_ADDR=\\).*|\\1$mailreplytoaddr|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(MAIL_REPLYTO_ADDR=\\).*|\\1$mailreplytoaddr|" "$APP_PATH/.env"
|
||||
|
||||
echo -n " Reply to name:"
|
||||
read -r mailreplytoname
|
||||
sed -i "s|^\\(MAIL_REPLYTO_NAME=\\).*|\\1$mailreplytoname|" "$webdir/$name/.env"
|
||||
sed -i "s|^\\(MAIL_REPLYTO_NAME=\\).*|\\1$mailreplytoname|" "$APP_PATH/.env"
|
||||
setupmail="yes"
|
||||
;;
|
||||
[nN] | [n|N][O|o] )
|
||||
|
|
|
|||
Loading…
Reference in a new issue