diff --git a/app/Http/Controllers/LicensesController.php b/app/Http/Controllers/LicensesController.php index cd50f90c55..3ffeb77742 100755 --- a/app/Http/Controllers/LicensesController.php +++ b/app/Http/Controllers/LicensesController.php @@ -792,7 +792,8 @@ class LicensesController extends Controller ->with('supplier_list', $supplier_list) ->with('license', $license) ->with('maintained_list', $maintained_list) - ->with('company_list', $company_list); + ->with('company_list', $company_list) + ->with('manufacturer_list', Helper::manufacturerList()); } diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index c03c2710ae..d3f86767e4 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -109,8 +109,8 @@ class ReportsController extends Controller 'model.manufacturer', 'company' ) - ->orderBy('created_at', 'DESC') - ->get(); + ->orderBy('created_at', 'DESC') + ->get(); return View::make('reports/asset', compact('assets'))->with('settings', $settings); } diff --git a/docker/001-default-ssl.conf b/docker/001-default-ssl.conf index dc55d30d5d..ab8a6931ef 100644 --- a/docker/001-default-ssl.conf +++ b/docker/001-default-ssl.conf @@ -50,7 +50,7 @@ # when the CA certificates are directly appended to the server # certificate for convinience. #SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt - SSLCertificateChainFile /etc/ssl/private/snipeit-ssl.crt + SSLCertificateChainFile /var/lib/snipeit/ssl/snipeit-ssl.crt # Certificate Authority (CA): # Set the CA certificate verification path where to find CA