mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 13:44:06 -08:00
9c8ca6af21
commite321aeabae
Merge:8ec99ff43
37568ae9e
Author: snipe <snipe@snipe.net> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # routes/web/fields.php # tests/unit/UserTest.php commit37568ae9ec
Merge:01a832169
32ad9050c
Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit32ad9050cf
Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit01a832169c
Merge:bcad49ce7
3c6883489
Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit3c6883489c
Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commitbcad49ce79
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commitb5acca89d7
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commite52919cf1b
Merge:714576be4
29f3a5c48
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit29f3a5c48f
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit134e8e6fb9
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit714576be45
Merge:b999c50a2
512899294
Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit5128992940
Author: Brady Wetherington <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit0291323502
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commite0f6f9b839
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commitf1a6308002
Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commitb999c50a2e
Merge:9ca20e496
e3906b245
Author: snipe <snipe@snipe.net> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commite3906b245c
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit9ca20e4964
Merge:e0644dbbf
456a74d88
Author: Brady Wetherington <bwetherington@grokability.com> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit456a74d88c
Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit799c059070
Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commitc62d43a778
Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commitb725bd0fae
Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commite0644dbbf6
Merge:5b6925b00
004ecad05
Author: Brady Wetherington <bwetherington@grokability.com> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit5b6925b00c
Author: snipe <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commitdf17a859bf
Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit24c43056ba
Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit606b7e905d
Author: snipe <snipe@snipe.net> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commitd73ddad477
Author: snipe <snipe@snipe.net> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit9a39cf721e
Merge:7410b1683
8994f3e15
Author: snipe <snipe@snipe.net> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit7410b16835
Merge:e955c983a
b09e7d19b
Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit8994f3e15e
Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commitd23f1a77ca
Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commite955c983a3
Merge:2fa17ac18
eed41e454
Author: snipe <snipe@snipe.net> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commitb09e7d19b3
Author: Brady Wetherington <uberbrady@gmail.com> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit2fa17ac185
Merge:b90515437
3b1e46f72
Author: snipe <snipe@snipe.net> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit3b1e46f72b
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit0c1a1de2a2
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit20c9ae5818
Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commiteed41e4549
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commitb750f4754f
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commitc17a06792a
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit4f76cc6cfb
Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commitb905154373
Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commitdaf748e531
Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit799a93c46a
Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit34aa12e229
Merge:81a633288
897757bd0
Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit897757bd04
Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commitc7125c3937
Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit81a6332889
Author: snipe <snipe@snipe.net> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses commit6e563f6e4b
Merge:5320f5c67
7f69ae953
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit5320f5c67c
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit7f69ae953b
Merge:c79f8c1ba
17f6fbabf
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit17f6fbabfa
Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commitc79f8c1baf
Merge:12c92e30b
536401fe0
Author: snipe <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commite7a820f7c9
Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit12c92e30b7
Author: snipe <snipe@snipe.net> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commitfd10b755b0
Author: snipe <snipe@snipe.net> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commitdbbb7680d9
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commitcf0dd5bbad
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit25e53d8c7f
Merge:ec6ed256f
89d433b41
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit89d433b41a
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commite2570ada6f
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit45afe725a1
Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit536401fe0f
Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commitec6ed256fb
Author: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit2aaa7bed2d
Merge:339bdddc3
cc9f1577a
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commitcc9f1577a4
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commitab1fe8be0c
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit339bdddc38
Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit35b9cf4b70
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit7ccb41371e
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit2e60a457bf
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit2390d2160b
Merge:b42801f6a
00b051b8c
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit00b051b8c7
Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit05b3a9ad7e
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit4fb880384f
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit43042ad841
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commita716382ac4
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit36c8f7f4f1
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commitb42801f6ae
Merge:de4934f21
946129f20
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit946129f206
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commitb941ef1e08
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commitd1aa11ec89
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commitde4934f21d
Merge:af06e4205
b10076b01
Author: snipe <snipe@snipe.net> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings commitb10076b015
Author: Godfrey M <godmartinz@gmail.com> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commitaf06e42056
Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit9a2440dc4b
Merge:beae8efb2
2ac1c1636
Author: snipe <snipe@snipe.net> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid Better handle the logic to determine if we should display the license checkout blade [ch13792] commit2ac1c1636c
Author: snipe <snipe@snipe.net> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit004ecad059
Author: Peter Upfold <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commitbeae8efb21
Merge:d14ab7e3e
9839e5e56
Author: snipe <snipe@snipe.net> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit9839e5e566
Author: Godfrey M <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commitd14ab7e3e1
Author: snipe <snipe@snipe.net> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <snipe@snipe.net> commite7f74d94c1
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commite97cf011b6
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commited23505054
Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit001e721530
Merge:f88683766
8210da6e8
Author: snipe <snipe@snipe.net> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit8210da6e82
Author: Daniel Meltzer <dmeltzer.devel@gmail.com> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commitf88683766b
Author: snipe <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commite4385c0f8c
Author: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit0550fe0ffa
Author: snipe <snipe@snipe.net> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <snipe@snipe.net> commit7fb3a9b82c
Merge:9a2ed804c
ecb1e87fe
Author: snipe <snipe@snipe.net> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commitecb1e87fe6
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commitf43df5f041
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit95cc48e422
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net> commit9a2ed804ca
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <snipe@snipe.net> commitd20fad28e5
Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <snipe@snipe.net> commitae813ddf75
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commitbb42109c0c
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commitf46ecf8ec0
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commitb9e821c0e6
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <snipe@snipe.net> commit9ee28c7513
Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <snipe@snipe.net> commit1a8ba06702
Merge:0fd232e70
ee4d69b1c
Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit0fd232e70d
Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <snipe@snipe.net> commitee4d69b1c5
Merge:31c535094
d1ad11194
Author: snipe <snipe@snipe.net> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commitd1ad111949
Author: Alexander Chibrikin <alek13.me@gmail.com> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see https://github.com/maknz/slack/issues/94 commit31c5350941
Author: snipe <snipe@snipe.net> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <snipe@snipe.net> commit7eb70e17e0
Merge:5bb4f271a
3dfcb4699
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit3dfcb46991
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit96eb96f964
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commita2f08bd3ba
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commite009fbe59f
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <snipe@snipe.net> commit5bb4f271aa
Author: snipe <snipe@snipe.net> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <snipe@snipe.net>
789 lines
23 KiB
Bash
Executable file
789 lines
23 KiB
Bash
Executable file
#!/bin/bash
|
|
#/ Usage: snipeit.sh [-vh]
|
|
#/
|
|
#/ Install Snipe-IT open source asset management.
|
|
#/
|
|
#/ OPTIONS:
|
|
#/ -v | --verbose Enable verbose output.
|
|
#/ -h | --help Show this message.
|
|
|
|
######################################################
|
|
# Snipe-It Install Script #
|
|
# Script created by Mike Tucker #
|
|
# mtucker6784@gmail.com #
|
|
# #
|
|
# Feel free to modify, but please give #
|
|
# credit where it's due. Thanks! #
|
|
######################################################
|
|
|
|
# Parse arguments
|
|
while true; do
|
|
case "$1" in
|
|
-h|--help)
|
|
show_help=true
|
|
shift
|
|
;;
|
|
-v|--verbose)
|
|
set -x
|
|
verbose=true
|
|
shift
|
|
;;
|
|
-*)
|
|
echo "Error: invalid argument: '$1'" 1>&2
|
|
exit 1
|
|
;;
|
|
*)
|
|
break
|
|
;;
|
|
esac
|
|
done
|
|
|
|
print_usage () {
|
|
grep '^#/' <"$0" | cut -c 4-
|
|
exit 1
|
|
}
|
|
|
|
if [ -n "$show_help" ]; then
|
|
print_usage
|
|
else
|
|
for x in "$@"; do
|
|
if [ "$x" = "--help" ] || [ "$x" = "-h" ]; then
|
|
print_usage
|
|
fi
|
|
done
|
|
fi
|
|
|
|
# ensure running as root
|
|
if [ "$(id -u)" != "0" ]; then
|
|
#Debian doesnt have sudo if root has a password.
|
|
if ! hash sudo 2>/dev/null; then
|
|
exec su -c "$0" "$@"
|
|
else
|
|
exec sudo "$0" "$@"
|
|
fi
|
|
fi
|
|
|
|
clear
|
|
|
|
readonly APP_USER="snipeitapp"
|
|
readonly APP_NAME="snipeit"
|
|
readonly APP_PATH="/var/www/html/$APP_NAME"
|
|
|
|
progress () {
|
|
spin[0]="-"
|
|
spin[1]="\\"
|
|
spin[2]="|"
|
|
spin[3]="/"
|
|
|
|
echo -n " "
|
|
while kill -0 "$pid" > /dev/null 2>&1; do
|
|
for i in "${spin[@]}"; do
|
|
echo -ne "\\b$i"
|
|
sleep .3
|
|
done
|
|
done
|
|
echo ""
|
|
}
|
|
|
|
log () {
|
|
if [ -n "$verbose" ]; then
|
|
eval "$@" |& tee -a /var/log/snipeit-install.log
|
|
else
|
|
eval "$@" |& tee -a /var/log/snipeit-install.log >/dev/null 2>&1
|
|
fi
|
|
}
|
|
|
|
install_packages () {
|
|
case $distro in
|
|
ubuntu|debian)
|
|
for p in $PACKAGES; do
|
|
if dpkg -s "$p" >/dev/null 2>&1; then
|
|
echo " * $p already installed"
|
|
else
|
|
echo " * Installing $p"
|
|
log "DEBIAN_FRONTEND=noninteractive apt-get install -y $p"
|
|
fi
|
|
done;
|
|
;;
|
|
raspbian)
|
|
for p in $PACKAGES; do
|
|
if dpkg -s "$p" >/dev/null 2>&1; then
|
|
echo " * $p already installed"
|
|
else
|
|
echo " * Installing $p"
|
|
log "DEBIAN_FRONTEND=noninteractive apt-get install -y -t buster $p"
|
|
fi
|
|
done;
|
|
;;
|
|
centos)
|
|
for p in $PACKAGES; do
|
|
if yum list installed "$p" >/dev/null 2>&1; then
|
|
echo " * $p already installed"
|
|
else
|
|
echo " * Installing $p"
|
|
log "yum -y install $p"
|
|
fi
|
|
done;
|
|
;;
|
|
fedora)
|
|
for p in $PACKAGES; do
|
|
if dnf list installed "$p" >/dev/null 2>&1; then
|
|
echo " * $p already installed"
|
|
else
|
|
echo " * Installing $p"
|
|
log "dnf -y install $p"
|
|
fi
|
|
done;
|
|
;;
|
|
esac
|
|
}
|
|
|
|
create_virtualhost () {
|
|
{
|
|
echo "<VirtualHost *:80>"
|
|
echo " <Directory $APP_PATH/public>"
|
|
echo " Allow From All"
|
|
echo " AllowOverride All"
|
|
echo " Options -Indexes"
|
|
echo " </Directory>"
|
|
echo ""
|
|
echo " DocumentRoot $APP_PATH/public"
|
|
echo " ServerName $fqdn"
|
|
echo "</VirtualHost>"
|
|
} >> "$apachefile"
|
|
}
|
|
|
|
create_user () {
|
|
echo "* Creating Snipe-IT user."
|
|
|
|
if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ] || [ "$distro" == "raspbian" ] ; 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 $APP_PATH"
|
|
|
|
echo "* Configuring .env file."
|
|
cp "$APP_PATH/.env.example" "$APP_PATH/.env"
|
|
|
|
#TODO escape SED delimiter in variables
|
|
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 composer."
|
|
install_composer
|
|
|
|
echo "* Setting permissions."
|
|
for chmod_dir in "$APP_PATH/storage" "$APP_PATH/public/uploads"; do
|
|
chmod -R 775 "$chmod_dir"
|
|
done
|
|
|
|
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 $APP_PATH/artisan key:generate --force"
|
|
|
|
echo "* Artisan Migrate."
|
|
log "php $APP_PATH/artisan migrate --force"
|
|
|
|
echo "* Creating scheduler cron."
|
|
(crontab -l ; echo "* * * * * /usr/bin/php $APP_PATH/artisan schedule:run >> /dev/null 2>&1") | crontab -
|
|
}
|
|
|
|
set_firewall () {
|
|
if [ "$(firewall-cmd --state)" == "running" ]; then
|
|
echo "* Configuring firewall to allow HTTP traffic only."
|
|
log "firewall-cmd --zone=public --add-port=http/tcp --permanent"
|
|
log "firewall-cmd --reload"
|
|
fi
|
|
}
|
|
|
|
set_selinux () {
|
|
#Check if SELinux is enforcing
|
|
if [ "$(getenforce)" == "Enforcing" ]; then
|
|
echo "* Configuring 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_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"
|
|
}
|
|
|
|
if [[ -f /etc/lsb-release || -f /etc/debian_version ]]; then
|
|
distro="$(lsb_release -is)"
|
|
version="$(lsb_release -rs)"
|
|
codename="$(lsb_release -cs)"
|
|
elif [ -f /etc/os-release ]; then
|
|
# 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"
|
|
version="6"
|
|
else
|
|
distro="unsupported"
|
|
fi
|
|
|
|
echo '
|
|
_____ _ __________
|
|
/ ___/____ (_)___ ___ / _/_ __/
|
|
\__ \/ __ \/ / __ \/ _ \______ / / / /
|
|
___/ / / / / / /_/ / __/_____// / / /
|
|
/____/_/ /_/_/ .___/\___/ /___/ /_/
|
|
/_/
|
|
'
|
|
|
|
echo ""
|
|
echo " Welcome to Snipe-IT Inventory Installer for CentOS, Fedora, Debian and Ubuntu!"
|
|
echo ""
|
|
shopt -s nocasematch
|
|
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
|
|
;;
|
|
*Raspbian*)
|
|
echo " The installer has detected $distro version $version codename $codename."
|
|
distro=raspbian
|
|
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 1
|
|
;;
|
|
esac
|
|
shopt -u nocasematch
|
|
|
|
echo -n " Q. What is the FQDN of your server? ($(hostname --fqdn)): "
|
|
read -r fqdn
|
|
if [ -z "$fqdn" ]; then
|
|
readonly fqdn="$(hostname --fqdn)"
|
|
fi
|
|
echo " Setting to $fqdn"
|
|
echo ""
|
|
|
|
ans=default
|
|
until [[ $ans == "yes" ]] || [[ $ans == "no" ]]; do
|
|
echo -n " Q. Do you want to automatically create the database user password? (y/n) "
|
|
read -r setpw
|
|
|
|
case $setpw in
|
|
[yY] | [yY][Ee][Ss] )
|
|
mysqluserpw="$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c16; echo)"
|
|
echo ""
|
|
ans="yes"
|
|
;;
|
|
[nN] | [n|N][O|o] )
|
|
echo -n " Q. What do you want your snipeit user password to be?"
|
|
read -rs mysqluserpw
|
|
echo ""
|
|
ans="no"
|
|
;;
|
|
*) echo " Invalid answer. Please type y or n"
|
|
;;
|
|
esac
|
|
done
|
|
|
|
case $distro in
|
|
debian)
|
|
if [[ "$version" =~ ^9 ]]; then
|
|
# Install for Debian 9.x
|
|
tzone=$(cat /etc/timezone)
|
|
|
|
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."
|
|
log "apt-get update && apt-get -y upgrade" & pid=$!
|
|
progress
|
|
|
|
echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
|
|
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
|
|
|
|
echo "* Configuring Apache."
|
|
create_virtualhost
|
|
log "a2enmod rewrite"
|
|
log "a2ensite $APP_NAME.conf"
|
|
|
|
set_hosts
|
|
|
|
echo "* Securing MariaDB."
|
|
/usr/bin/mysql_secure_installation
|
|
|
|
install_snipeit
|
|
|
|
echo "* Restarting Apache httpd."
|
|
log "service apache2 restart"
|
|
elif [[ "$version" =~ ^8 ]]; then
|
|
# Install for Debian 8.x
|
|
tzone=$(cat /etc/timezone)
|
|
|
|
echo "* Adding MariaDB and ppa:ondrej/php repositories."
|
|
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 "add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/debian $codename main'"
|
|
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."
|
|
log "apt-get update && apt-get -y upgrade" & pid=$!
|
|
progress
|
|
|
|
echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
|
|
PACKAGES="mariadb-server mariadb-client 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
|
|
|
|
echo "* Configuring Apache."
|
|
create_virtualhost
|
|
log "a2enmod rewrite"
|
|
log "a2ensite $APP_NAME.conf"
|
|
|
|
set_hosts
|
|
|
|
echo "* Securing MariaDB."
|
|
/usr/bin/mysql_secure_installation
|
|
|
|
install_snipeit
|
|
|
|
echo "* Restarting Apache httpd."
|
|
log "service apache2 restart"
|
|
else
|
|
echo "Unsupported Debian version. Version found: $version"
|
|
exit 1
|
|
fi
|
|
;;
|
|
ubuntu)
|
|
if [ "$version" -ge "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"
|
|
log "mv /etc/apache2/sites-enabled/000-default.conf /etc/apache2/sites-enabled/111-default.conf"
|
|
log "mv /etc/apache2/sites-enabled/snipeit.conf /etc/apache2/sites-enabled/000-snipeit.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)
|
|
|
|
echo "* Adding MariaDB and ppa:ondrej/php repositories."
|
|
log "apt-get install -y software-properties-common"
|
|
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 -y ppa:ondrej/php"
|
|
|
|
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-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
|
|
|
|
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 "service mysql start"
|
|
|
|
echo "* Securing MariaDB."
|
|
/usr/bin/mysql_secure_installation
|
|
|
|
install_snipeit
|
|
|
|
echo "* Restarting Apache httpd."
|
|
log "service apache2 restart"
|
|
elif [ "$version" == "14.04" ]; then
|
|
# Install for Ubuntu 14.04
|
|
tzone=$(cat /etc/timezone)
|
|
|
|
echo "* Adding MariaDB and ppa:ondrej/php repositories."
|
|
log "apt-get install -y software-properties-common"
|
|
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 ppa:ondrej/php -y"
|
|
|
|
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 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
|
|
|
|
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 "service mysql start"
|
|
|
|
echo "* Securing MariaDB."
|
|
/usr/bin/mysql_secure_installation
|
|
|
|
install_snipeit
|
|
|
|
echo "* Restarting Apache httpd."
|
|
log "service apache2 restart"
|
|
else
|
|
echo "Unsupported Ubuntu version. Version found: $version"
|
|
exit 1
|
|
fi
|
|
;;
|
|
raspbian)
|
|
if [[ "$version" =~ ^9 ]]; then
|
|
# Install for Raspbian 9.x
|
|
tzone=$(cat /etc/timezone)
|
|
cat >/etc/apt/sources.list.d/10-buster.list <<EOL
|
|
deb http://mirrordirector.raspbian.org/raspbian/ buster main contrib non-free rpi
|
|
EOL
|
|
|
|
cat >/etc/apt/preferences.d/10-buster <<EOL
|
|
Package: *
|
|
Pin: release n=stretch
|
|
Pin-Priority: 900
|
|
|
|
Package: *
|
|
Pin: release n=buster
|
|
Pin-Priority: 750
|
|
EOL
|
|
|
|
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-php7.2 php7.2 php7.2-mcrypt php7.2-curl php7.2-mysql php7.2-gd php7.2-ldap php7.2-zip php7.2-mbstring php7.2-xml php7.2-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"
|
|
else
|
|
echo "Unsupported Raspbian version. Version found: $version"
|
|
exit 1
|
|
fi
|
|
;;
|
|
centos)
|
|
if [[ "$version" =~ ^6 ]]; then
|
|
# Install for CentOS/Redhat 6.x
|
|
tzone=$(grep ZONE /etc/sysconfig/clock | tr -d '"' | sed 's/ZONE=//g');
|
|
|
|
echo "* Adding IUS, epel-release and MariaDB repositories."
|
|
mariadbRepo=/etc/yum.repos.d/MariaDB.repo
|
|
touch "$mariadbRepo"
|
|
{
|
|
echo "[mariadb]"
|
|
echo "name = MariaDB"
|
|
echo "baseurl = http://yum.mariadb.org/10.0/centos6-amd64"
|
|
echo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
|
|
echo "gpgcheck=1"
|
|
echo "enable=1"
|
|
} >> "$mariadbRepo"
|
|
|
|
log "yum -y install wget epel-release"
|
|
log "yum -y install https://centos6.iuscommunity.org/ius-release.rpm"
|
|
log "rpm --import /etc/pki/rpm-gpg/IUS-COMMUNITY-GPG-KEY"
|
|
|
|
echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
|
|
PACKAGES="httpd mariadb-server git unzip php71u php71u-mysqlnd php71u-bcmath php71u-cli php71u-common php71u-embedded php71u-gd php71u-mbstring php71u-mcrypt php71u-ldap php71u-json php71u-simplexml php71u-process"
|
|
install_packages
|
|
|
|
echo "* Configuring Apache."
|
|
create_virtualhost
|
|
|
|
echo "* Setting MariaDB to start on boot and starting MariaDB."
|
|
log "chkconfig mysql on"
|
|
log "/sbin/service mysql start"
|
|
|
|
set_hosts
|
|
|
|
echo "* Securing MariaDB."
|
|
/usr/bin/mysql_secure_installation
|
|
|
|
install_snipeit
|
|
|
|
if /sbin/service iptables status >/dev/null 2>&1; then
|
|
echo "* Configuring iptables."
|
|
iptables -I INPUT 1 -p tcp -m tcp --dport 80 -j ACCEPT
|
|
iptables -I INPUT 1 -p tcp -m tcp --dport 443 -j ACCEPT
|
|
service iptables save
|
|
fi
|
|
|
|
echo "* Setting Apache httpd to start on boot and starting service."
|
|
log "chkconfig httpd on"
|
|
log "/sbin/service httpd start"
|
|
elif [[ "$version" =~ ^7 ]]; then
|
|
# Install for CentOS/Redhat 7
|
|
tzone=$(timedatectl | gawk -F'[: ]' ' $9 ~ /zone/ {print $11}');
|
|
|
|
echo "* Adding IUS, epel-release and MariaDB repositories."
|
|
log "yum -y install wget epel-release"
|
|
log "yum -y install https://centos7.iuscommunity.org/ius-release.rpm"
|
|
log "rpm --import /etc/pki/rpm-gpg/IUS-COMMUNITY-GPG-KEY"
|
|
|
|
echo "* Installing Apache httpd, PHP, MariaDB and other requirements."
|
|
PACKAGES="httpd mariadb-server git unzip php71u php71u-mysqlnd php71u-bcmath php71u-cli php71u-common php71u-embedded php71u-gd php71u-mbstring php71u-mcrypt php71u-ldap php71u-json php71u-simplexml php71u-process"
|
|
install_packages
|
|
|
|
echo "* Configuring Apache."
|
|
create_virtualhost
|
|
|
|
set_hosts
|
|
|
|
echo "* Setting MariaDB to start on boot and starting MariaDB."
|
|
log "systemctl enable mariadb.service"
|
|
log "systemctl start mariadb.service"
|
|
|
|
echo "* Securing MariaDB."
|
|
/usr/bin/mysql_secure_installation
|
|
|
|
install_snipeit
|
|
|
|
set_firewall
|
|
|
|
set_selinux
|
|
|
|
echo "* Setting Apache httpd to start on boot and starting service."
|
|
log "systemctl enable httpd.service"
|
|
log "systemctl restart httpd.service"
|
|
else
|
|
echo "Unsupported CentOS version. Version found: $version"
|
|
exit 1
|
|
fi
|
|
;;
|
|
fedora)
|
|
if [ "$version" -ge 26 ]; then
|
|
# Install for Fedora 26+
|
|
tzone=$(timedatectl | gawk -F'[: ]' ' $9 ~ /zone/ {print $11}');
|
|
|
|
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"
|
|
install_packages
|
|
|
|
echo "* Configuring Apache."
|
|
create_virtualhost
|
|
|
|
set_hosts
|
|
|
|
echo "* Setting MariaDB to start on boot and starting MariaDB."
|
|
log "systemctl enable mariadb.service"
|
|
log "systemctl start mariadb.service"
|
|
|
|
echo "* Securing MariaDB."
|
|
/usr/bin/mysql_secure_installation
|
|
|
|
install_snipeit
|
|
|
|
set_firewall
|
|
|
|
set_selinux
|
|
|
|
echo "* Setting Apache httpd to start on boot and starting service."
|
|
log "systemctl enable httpd.service"
|
|
log "systemctl restart httpd.service"
|
|
else
|
|
echo "Unsupported Fedora version. Version found: $version"
|
|
exit 1
|
|
fi
|
|
esac
|
|
|
|
setupmail=default
|
|
until [[ $setupmail == "yes" ]] || [[ $setupmail == "no" ]]; do
|
|
echo -n " Q. Do you want to configure mail server settings? (y/n) "
|
|
read -r setupmail
|
|
|
|
case $setupmail in
|
|
[yY] | [yY][Ee][Ss] )
|
|
echo -n " Outgoing mailserver address:"
|
|
read -r mailhost
|
|
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|" "$APP_PATH/.env"
|
|
|
|
echo -n " Username:"
|
|
read -r mailusername
|
|
sed -i "s|^\\(MAIL_USERNAME=\\).*|\\1$mailusername|" "$APP_PATH/.env"
|
|
|
|
echo -n " Password:"
|
|
read -rs mailpassword
|
|
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|" "$APP_PATH/.env"
|
|
|
|
echo -n " From address:"
|
|
read -r mailfromaddr
|
|
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|" "$APP_PATH/.env"
|
|
|
|
echo -n " Reply to address:"
|
|
read -r mailreplytoaddr
|
|
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|" "$APP_PATH/.env"
|
|
setupmail="yes"
|
|
;;
|
|
[nN] | [n|N][O|o] )
|
|
setupmail="no"
|
|
;;
|
|
*) echo " Invalid answer. Please type y or n"
|
|
;;
|
|
esac
|
|
done
|
|
|
|
echo ""
|
|
echo " ***Open http://$fqdn to login to Snipe-IT.***"
|
|
echo ""
|
|
echo ""
|
|
echo "* Cleaning up..."
|
|
rm -f snipeit.sh
|
|
rm -f install.sh
|
|
echo "* Finished!"
|
|
sleep 1
|