Merge branch 'develop'

.all-contributorsrc

@@ -2146,6 +2146,78 @@
  "contributions": [
  "code"
  ]
+ },
+ {
+ "login": "raelldottin",
+ "name": "Raell Dottin",
+ "avatar_url": "https://avatars.githubusercontent.com/u/317015?v=4",
+ "profile": "https://github.com/raelldottin",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "misilot",
+ "name": "Tom Misilo",
+ "avatar_url": "https://avatars.githubusercontent.com/u/1446856?v=4",
+ "profile": "https://github.com/misilot",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "JuustoMestari",
+ "name": "David Davenne",
+ "avatar_url": "https://avatars.githubusercontent.com/u/4496300?v=4",
+ "profile": "http:https://david.davenne.be",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "ocelotsloth",
+ "name": "Mark Stenglein",
+ "avatar_url": "https://avatars.githubusercontent.com/u/9255772?v=4",
+ "profile": "https://markstenglein.com",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "ajsy",
+ "name": "ajsy",
+ "avatar_url": "https://avatars.githubusercontent.com/u/35658596?v=4",
+ "profile": "https://github.com/ajsy",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "t3easy",
+ "name": "Jan Kiesewetter",
+ "avatar_url": "https://avatars.githubusercontent.com/u/3628035?v=4",
+ "profile": "https://github.com/t3easy",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "Tetrachloromethane250",
+ "name": "Tetrachloromethane250",
+ "avatar_url": "https://avatars.githubusercontent.com/u/79449630?v=4",
+ "profile": "https://github.com/Tetrachloromethane250",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "kajes",
+ "name": "Lars Kajes",
+ "avatar_url": "https://avatars.githubusercontent.com/u/22004482?v=4",
+ "profile": "https://www.kajes.se/",
+ "contributions": [
+ "code"
+ ]
  }
  ]
 }

.env.example

@@ -144,6 +144,11 @@ APP_LOG=single
 APP_LOG_MAX_FILES=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
+APP_FORCE_TLS=false
 GOOGLE_MAPS_API=
 LDAP_MEM_LIM=500M
 LDAP_TIME_LIM=600
+IMPORT_TIME_LIMIT=600
+IMPORT_MEMORY_LIMIT=500M
+REPORT_TIME_LIMIT=12000
+

.gitignore

@@ -52,6 +52,8 @@ tests/_support/_generated/*
 *.cache
 
 .vagrant
+*.log
+*.retry
 
 \.php_cs\.dist
 

Dockerfile.alpine

@@ -57,6 +57,7 @@ RUN \
  && mkdir -p "/var/lib/snipeit/dumps" && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups" \
  && mkdir -p "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
  && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \
+ && chown -h "/var/www/html/storage/*.key"
  && chown -R apache "/var/lib/snipeit"
 
 # Install composer

README.md

@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-235-orange.svg?style=flat-square)](#contributors) 
+[![All Contributors](https://img.shields.io/badge/all_contributors-243-orange.svg?style=flat-square)](#contributors) 
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -122,7 +122,8 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars0.githubusercontent.com/u/1255375?v=4" width="110px;"/><br /><sub>Peter Upfold</sub>](https://peter.upfold.org.uk/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterUpfold "Code") | [<img src="https://avatars2.githubusercontent.com/u/961717?v=4" width="110px;"/><br /><sub>Jared Biel</sub>](https://github.com/jbiel)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbiel "Code") | [<img src="https://avatars1.githubusercontent.com/u/1733625?v=4" width="110px;"/><br /><sub>Dampfklon</sub>](https://github.com/dampfklon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dampfklon "Code") | [<img src="https://avatars2.githubusercontent.com/u/52973156?v=4" width="110px;"/><br /><sub>Charles Hamilton</sub>](https://communityclosing.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chamilton-ccn "Code") | [<img src="https://avatars.githubusercontent.com/u/551789?v=4" width="110px;"/><br /><sub>Giuseppe Iannello</sub>](https://github.com/giannello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=giannello "Code") | [<img src="https://avatars.githubusercontent.com/u/3691490?v=4" width="110px;"/><br /><sub>Peter Dave Hello</sub>](https://www.peterdavehello.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterDaveHello "Code") | [<img src="https://avatars.githubusercontent.com/u/6106332?v=4" width="110px;"/><br /><sub>sigmoidal</sub>](https://github.com/sigmoidal)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sigmoidal "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/2082554?v=4" width="110px;"/><br /><sub>Vincent Lainé</sub>](https://github.com/phenixdotnet)<br />[💻](https://github.com/snipe/snipe-it/commits?author=phenixdotnet "Code") | [<img src="https://avatars.githubusercontent.com/u/1943040?v=4" width="110px;"/><br /><sub>Lucas Pleß</sub>](http:https://www.lucas-pless.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derlucas "Code") | [<img src="https://avatars.githubusercontent.com/u/472804?v=4" width="110px;"/><br /><sub>Ian Littman</sub>](http:https://twitter.com/iansltx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=iansltx "Code") | [<img src="https://avatars.githubusercontent.com/u/3519029?v=4" width="110px;"/><br /><sub>João Paulo</sub>](https://github.com/PauloLuna)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PauloLuna "Code") | [<img src="https://avatars.githubusercontent.com/u/70443365?v=4" width="110px;"/><br /><sub>ThoBur</sub>](https://github.com/ThoBur)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ThoBur "Code") | [<img src="https://avatars.githubusercontent.com/u/1972329?v=4" width="110px;"/><br /><sub>Alexander Chibrikin</sub>](http:https://phpprofi.ru/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alek13 "Code") | [<img src="https://avatars.githubusercontent.com/u/438332?v=4" width="110px;"/><br /><sub>Anthony Winstanley</sub>](https://github.com/winstan)<br />[💻](https://github.com/snipe/snipe-it/commits?author=winstan "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/3075214?v=4" width="110px;"/><br /><sub>Folke</sub>](https://github.com/fashberg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fashberg "Code") | [<img src="https://avatars.githubusercontent.com/u/1351571?v=4" width="110px;"/><br /><sub>Bennett Blodinger</sub>](https://github.com/benwa)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benwa "Code") | [<img src="https://avatars.githubusercontent.com/u/2974631?v=4" width="110px;"/><br /><sub>NMC</sub>](https://nmc.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ncareau "Code") | [<img src="https://avatars.githubusercontent.com/u/52182449?v=4" width="110px;"/><br /><sub>andres-baller</sub>](https://github.com/andres-baller)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andres-baller "Code") | [<img src="https://avatars.githubusercontent.com/u/67109348?v=4" width="110px;"/><br /><sub>sean-borg</sub>](https://github.com/sean-borg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sean-borg "Code") | [<img src="https://avatars.githubusercontent.com/u/32170051?v=4" width="110px;"/><br /><sub>EDVLeer</sub>](https://github.com/EDVLeer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=EDVLeer "Code") | [<img src="https://avatars.githubusercontent.com/u/23075196?v=4" width="110px;"/><br /><sub>Kurokat</sub>](https://github.com/Kurokat)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Kurokat "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") | [<img src="https://avatars.githubusercontent.com/u/317015?v=4" width="110px;"/><br /><sub>Raell Dottin</sub>](https://github.com/raelldottin)<br />[💻](https://github.com/snipe/snipe-it/commits?author=raelldottin "Code") | [<img src="https://avatars.githubusercontent.com/u/1446856?v=4" width="110px;"/><br /><sub>Tom Misilo</sub>](https://github.com/misilot)<br />[💻](https://github.com/snipe/snipe-it/commits?author=misilot "Code") | [<img src="https://avatars.githubusercontent.com/u/4496300?v=4" width="110px;"/><br /><sub>David Davenne</sub>](http:https://david.davenne.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JuustoMestari "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/9255772?v=4" width="110px;"/><br /><sub>Mark Stenglein</sub>](https://markstenglein.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [<img src="https://avatars.githubusercontent.com/u/35658596?v=4" width="110px;"/><br /><sub>ajsy</sub>](https://github.com/ajsy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [<img src="https://avatars.githubusercontent.com/u/3628035?v=4" width="110px;"/><br /><sub>Jan Kiesewetter</sub>](https://github.com/t3easy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [<img src="https://avatars.githubusercontent.com/u/79449630?v=4" width="110px;"/><br /><sub>Tetrachloromethane250</sub>](https://github.com/Tetrachloromethane250)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [<img src="https://avatars.githubusercontent.com/u/22004482?v=4" width="110px;"/><br /><sub>Lars Kajes</sub>](https://www.kajes.se/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

Vagrantfile

@@ -8,25 +8,34 @@ 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"
+ bionic.vm.network "forwarded_port", guest: 80, host: 8080
+ bionic.vm.synced_folder ".", "/vagrant", :owner => 'www-data',
+ :group => 'vagrant', :mount_options => ['dmode=775', 'fmode=775']
+ bionic.vm.provision "ansible_local" do |ansible|
+ ansible.playbook = "ansible/ubuntu/vagrant_playbook.yml"
+ end
  end
 
  config.vm.define "xenial" do |xenial|
  xenial.vm.box = "ubuntu/xenial64"
  xenial.vm.hostname = 'xenial'
- xenial.vm.network "public_network", bridge: NETWORK_BRIDGE
- xenial.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
- xenial.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
+ xenial.vm.network "forwarded_port", guest: 80, host: 8080
+ xenial.vm.synced_folder ".", "/vagrant", :owner => 'www-data',
+ :group => 'vagrant', :mount_options => ['dmode=775', 'fmode=775']
+ xenial.vm.provision "ansible_local" do |ansible|
+ ansible.playbook = "ansible/ubuntu/vagrant_playbook.yml"
+ end
  end
 
  config.vm.define "trusty" do |trusty|
  trusty.vm.box = "ubuntu/trusty32"
  trusty.vm.hostname = 'trusty'
- trusty.vm.network "public_network", bridge: NETWORK_BRIDGE
- trusty.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
- trusty.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
+ trusty.vm.network "forwarded_port", guest: 80, host: 8080
+ trusty.vm.synced_folder ".", "/vagrant", :owner => 'www-data',
+ :group => 'vagrant', :mount_options => ['dmode=775', 'fmode=775']
+ trusty.vm.provision "ansible_local" do |ansible|
+ ansible.playbook = "ansible/ubuntu/vagrant_playbook.yml"
+ end
  end
 
  config.vm.define "centos7" do |centos7|

ansible/ubuntu/apachevirtualhost.conf.j2

@@ -0,0 +1,10 @@
+<VirtualHost *:80>
+ <Directory {{ app_path }}/public>
+ Allow From All
+ AllowOverride All
+ Options -Indexes
+ </Directory>
+
+ DocumentRoot {{ app_path }}/public
+ ServerName {{ fqdn }}
+</VirtualHost>