Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop installer update #1216

Open
wants to merge 271 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
271 commits
Select commit Hold shift + click to select a range
3ff4242
Update meshcentral.conf
ninjamonkey198206 Jun 1, 2022
fbd0164
Update rmm.conf
ninjamonkey198206 Jun 1, 2022
1f30e57
Update config.json
ninjamonkey198206 Jun 1, 2022
84e941b
Update local_settings.py
ninjamonkey198206 Jun 1, 2022
9a97fae
Merge branch 'amidaware:develop' into develop
ninjamonkey198206 Jun 5, 2022
757104a
Merge branch 'amidaware:develop' into develop
ninjamonkey198206 Jun 8, 2022
9a9789d
Update app.ini
ninjamonkey198206 Jun 10, 2022
31e0aad
Merge branch 'amidaware:develop' into develop
ninjamonkey198206 Jun 15, 2022
ebc5fc2
Merge branch 'amidaware:develop' into develop
ninjamonkey198206 Jun 17, 2022
9b99d9b
Update frontend.conf
ninjamonkey198206 Jun 17, 2022
d0a8a9f
Update meshcentral.conf
ninjamonkey198206 Jun 17, 2022
d1fcd9b
Update rmm.conf
ninjamonkey198206 Jun 17, 2022
229fb5d
Update app.ini
ninjamonkey198206 Jun 17, 2022
0327542
Create bashfunctions.cfg
ninjamonkey198206 Jun 17, 2022
24f74c3
Create installer-util.sh
ninjamonkey198206 Jun 17, 2022
c36e0b9
Correcting tabs from import
ninjamonkey198206 Jun 17, 2022
1303c49
Adding Section/CFG file descriptions
ninjamonkey198206 Jun 18, 2022
3e8906e
Testing cfg function to pull multiple files
ninjamonkey198206 Jun 18, 2022
2de1f53
updated repo url
ninjamonkey198206 Jun 18, 2022
bd72b24
Added cfg files for breakout
ninjamonkey198206 Jun 18, 2022
80bcbe2
Added security options file for rework
ninjamonkey198206 Jun 18, 2022
b70f922
Testing function to pull separate cfg files
ninjamonkey198206 Jun 19, 2022
6cbf194
more testing
ninjamonkey198206 Jun 19, 2022
ec4feaa
troubleshooting altered cfg version check
ninjamonkey198206 Jun 19, 2022
1393429
Prepping for cfg split
ninjamonkey198206 Jun 19, 2022
4939cab
commented out cfg imports because I forgot
ninjamonkey198206 Jun 19, 2022
add5101
more
ninjamonkey198206 Jun 19, 2022
48998be
updated to new dir and updated cfg update
ninjamonkey198206 Jun 20, 2022
a5fbe80
Merge branch 'amidaware:develop' into develop
ninjamonkey198206 Jun 20, 2022
60f2014
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jun 20, 2022
80e8260
Finished updates for split cfg files
ninjamonkey198206 Jun 20, 2022
1a11c0e
Fix for split cfg check, added cfg url
ninjamonkey198206 Jun 20, 2022
97d642c
Added function to check tactical user
ninjamonkey198206 Jun 21, 2022
f828ff5
Fixed missing exit if not right user
ninjamonkey198206 Jun 21, 2022
64e1eea
Automated tactical user and pass creation
ninjamonkey198206 Jun 21, 2022
b576975
Updated useradd command to match docs
ninjamonkey198206 Jun 21, 2022
66e5969
Merge branch 'amidaware:develop' into develop
ninjamonkey198206 Jun 22, 2022
e33a620
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jun 22, 2022
ed54e90
Cleanup and prep for automated installs
ninjamonkey198206 Jun 23, 2022
e611b5b
Merge branch 'develop-installer-update' of https://github.com/ninjamo…
ninjamonkey198206 Jun 23, 2022
e65ea05
Merge branch 'amidaware:develop' into develop
ninjamonkey198206 Jun 23, 2022
111d578
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jun 23, 2022
6983a1a
more prepwork for automated installations
ninjamonkey198206 Jun 23, 2022
a48be3d
Merge branch 'amidaware:develop' into develop
ninjamonkey198206 Jun 23, 2022
2e4396b
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jun 23, 2022
c851aad
Updated install and other functions for automation
ninjamonkey198206 Jun 23, 2022
28ca94c
Merge branch 'develop-installer-update' of https://github.com/ninjamo…
ninjamonkey198206 Jun 23, 2022
ca8886a
More updates for automated commandline installs
ninjamonkey198206 Jun 24, 2022
5a8bf09
minor fixes to comments
ninjamonkey198206 Jun 24, 2022
0aa12c0
Finished (?) catches for wrong command line args
ninjamonkey198206 Jun 24, 2022
cd6ea6f
Added missing email address commandline check
ninjamonkey198206 Jun 24, 2022
6b74bd5
Added check to automated cert function
ninjamonkey198206 Jun 24, 2022
53c8acd
reversions from print_x functions and add ts check
ninjamonkey198206 Jun 25, 2022
5c6139f
Merge branch 'amidaware:develop' into develop
ninjamonkey198206 Jun 25, 2022
fbf17b7
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jun 25, 2022
a7da9e4
Updated to match new uwsgi config
ninjamonkey198206 Jun 25, 2022
56a77d3
Reversions to not use print_x
ninjamonkey198206 Jun 25, 2022
f07e18a
fix variable name for dns info gathering
ninjamonkey198206 Jun 26, 2022
2a9b8db
Corrections to localhost test and resolution
ninjamonkey198206 Jun 26, 2022
1d39c4a
Correction to vim instructions
ninjamonkey198206 Jun 26, 2022
0d3dc77
Attempt to fix commandline args
ninjamonkey198206 Jun 26, 2022
f24e47e
Changed dh to 2048
ninjamonkey198206 Jun 26, 2022
00e0290
Attempt to correct various issues
ninjamonkey198206 Jun 26, 2022
2bef316
Corrected vim instructions, again
ninjamonkey198206 Jun 26, 2022
5a14e0d
Temp fix for backend build
ninjamonkey198206 Jun 26, 2022
df8c402
Removed unnecessary \ from conf and services
ninjamonkey198206 Jun 26, 2022
9357397
Fingers crossed backend fix is correct
ninjamonkey198206 Jun 26, 2022
d34273b
added import for ca chain to allow troubleshoot
ninjamonkey198206 Jun 26, 2022
4a4b7a1
Update to cert symlinks
ninjamonkey198206 Jun 26, 2022
5bf187e
edit to make text prettier
ninjamonkey198206 Jun 26, 2022
1e128ed
Backend function cleanup
ninjamonkey198206 Jun 26, 2022
1aceee8
Updated completion text for nats websockets
ninjamonkey198206 Jun 26, 2022
bdd7915
Merge branch 'amidaware:develop' into develop
ninjamonkey198206 Jun 26, 2022
b50ac32
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jun 26, 2022
eea3b24
Merge branch 'develop' of https://github.com/ninjamonkey198206/tactic…
ninjamonkey198206 Jun 26, 2022
192c8d8
Merge branch 'develop-installer-update' of https://github.com/ninjamo…
ninjamonkey198206 Jun 26, 2022
a8556a3
reverted completion text
ninjamonkey198206 Jun 26, 2022
44c29cc
added nginx conf for nats websockets
ninjamonkey198206 Jun 26, 2022
dac0d96
reverted use of symlinks for certs, causing issues
ninjamonkey198206 Jun 27, 2022
861e279
edited nginx conf config functions for reversion
ninjamonkey198206 Jun 27, 2022
9fc3942
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jun 27, 2022
f46ff0b
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jun 27, 2022
f29b34c
Merge branch 'develop-installer-update-ws' of https://github.com/ninj…
ninjamonkey198206 Jun 27, 2022
1533be8
updated to use new branch, derp
ninjamonkey198206 Jun 27, 2022
85e7728
Fixed helpers.py
ninjamonkey198206 Jun 27, 2022
c788f52
fixed nginx confs
ninjamonkey198206 Jun 27, 2022
d854fee
Updated installer and restore to bring in line
ninjamonkey198206 Jun 27, 2022
1699112
Updated frontend install to match changes
ninjamonkey198206 Jun 27, 2022
cb80751
Merge pull request #2 from ninjamonkey198206/develop-installer-update-ws
ninjamonkey198206 Jun 27, 2022
38e788f
Update installer-util.sh
ninjamonkey198206 Jun 27, 2022
642202a
Updated troubleshooting to use fullchain.pem
ninjamonkey198206 Jun 27, 2022
1dc9335
Updated troubleshooting to use fullchain.pem
ninjamonkey198206 Jun 27, 2022
900559c
removed accidental added / from rmm nginx config
ninjamonkey198206 Jun 27, 2022
abe561f
removed accidental added / from rmm nginx conf
ninjamonkey198206 Jun 27, 2022
4e2ce32
Added options to import/renew certs using LE dirs
ninjamonkey198206 Jun 27, 2022
3fd5b60
Various updates and fixes for troubleshooting
ninjamonkey198206 Jun 27, 2022
8210a1c
fix missing )
ninjamonkey198206 Jun 27, 2022
d619619
Updated cert import function to allow existing
ninjamonkey198206 Jun 27, 2022
320a277
Merge pull request #4 from ninjamonkey198206/develop-installer-update
ninjamonkey198206 Jun 27, 2022
20499f0
Attempt to fix localhost entry
ninjamonkey198206 Jun 27, 2022
d7ba80a
Merge pull request #5 from ninjamonkey198206/develop-installer-update-ws
ninjamonkey198206 Jun 27, 2022
9a65f60
Updated branch after merge
ninjamonkey198206 Jun 28, 2022
035af07
Testing cfg pull issue
ninjamonkey198206 Jun 28, 2022
d2bf44e
Testing cfg ver check fix
ninjamonkey198206 Jun 28, 2022
c99ad2e
Another test of cfg check
ninjamonkey198206 Jun 28, 2022
49116c2
Corrected cfg check after test
ninjamonkey198206 Jun 28, 2022
f9a1343
Corrected cfg check after test
ninjamonkey198206 Jun 28, 2022
3c20271
Further update for localhost detection
ninjamonkey198206 Jun 28, 2022
9c25e09
Further update for localhost detection
ninjamonkey198206 Jun 28, 2022
4abaef7
Fix to prevent config hosts running twice
ninjamonkey198206 Jun 28, 2022
d8d6a92
Test fix for frontend devinstall
ninjamonkey198206 Jun 28, 2022
a4c79cc
Updates to resolve devinstall issues
ninjamonkey198206 Jun 28, 2022
77bf56a
Merge pull request #6 from ninjamonkey198206/develop-installer-update
ninjamonkey198206 Jun 28, 2022
0987cdf
added checks for dns entry verification
ninjamonkey198206 Jun 29, 2022
d4beb88
Added additional dns checks
ninjamonkey198206 Jun 29, 2022
1498514
Added url verification for selected repo
ninjamonkey198206 Jun 29, 2022
cd2cd2d
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jun 29, 2022
5c766b9
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jun 30, 2022
f9e2837
Added functions to verify minimum specs
ninjamonkey198206 Jul 1, 2022
cd88234
Fixed sysinfo function names
ninjamonkey198206 Jul 1, 2022
280195d
Added check for storage capacity
ninjamonkey198206 Jul 1, 2022
38aeaed
Added further edits for automated runs
ninjamonkey198206 Jul 1, 2022
5e78998
Added backup cli option
ninjamonkey198206 Jul 1, 2022
2824c14
Fixed cli arg checks for required install info
ninjamonkey198206 Jul 1, 2022
c4fa073
Minor changes to formatting and grammar
ninjamonkey198206 Jul 1, 2022
62f1294
Remove disk space check
ninjamonkey198206 Jul 2, 2022
18dd668
Fixed cli args
ninjamonkey198206 Jul 2, 2022
b97d597
Fixed cli arg mesg to match changes
ninjamonkey198206 Jul 2, 2022
133a599
more cli arg fixes
ninjamonkey198206 Jul 2, 2022
6bc1106
Fix for cli troubleshooting launch
ninjamonkey198206 Jul 2, 2022
7ab6d17
Fixes for backup and restore cli functions
ninjamonkey198206 Jul 2, 2022
ec50500
Minor fix for help menu spacing
ninjamonkey198206 Jul 2, 2022
cc5a601
same as last
ninjamonkey198206 Jul 2, 2022
2128e1e
last formatting changes for help menu
ninjamonkey198206 Jul 2, 2022
94d1f11
Really, the last help menu fix
ninjamonkey198206 Jul 2, 2022
87a881c
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 3, 2022
36d284e
This better be the last update for help text
ninjamonkey198206 Jul 3, 2022
891b032
Merge branch 'develop-installer-update-ws' of https://github.com/ninj…
ninjamonkey198206 Jul 3, 2022
bedf4c5
Added fix for derpy lines from ncurses
ninjamonkey198206 Jul 3, 2022
9686dbc
Fix to python update if statement
ninjamonkey198206 Jul 3, 2022
dfd8323
Fixes to update functions
ninjamonkey198206 Jul 4, 2022
17c0df6
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 4, 2022
6e46b86
syntax fixes for nginx checks
ninjamonkey198206 Jul 4, 2022
a53f164
Merge branch 'develop-installer-update-ws' of https://github.com/ninj…
ninjamonkey198206 Jul 4, 2022
b5aca80
Fixes to various checks for update
ninjamonkey198206 Jul 4, 2022
599f6c5
Fixes for restore dns host file entries
ninjamonkey198206 Jul 4, 2022
18ad129
Minor fixes
ninjamonkey198206 Jul 4, 2022
b3573cd
Enabling webroot cert option during install
ninjamonkey198206 Jul 5, 2022
a10c2ca
moved prompt for webroot to separate function
ninjamonkey198206 Jul 5, 2022
660624b
fix for webroot cert generation
ninjamonkey198206 Jul 5, 2022
e08196f
disable ssl stapling during webroot cert gen
ninjamonkey198206 Jul 5, 2022
6c2a8f5
Added service restart post hook for webroot
ninjamonkey198206 Jul 5, 2022
005f195
Added webroot option to cli args with checks
ninjamonkey198206 Jul 5, 2022
6edbaa9
Updated install complete text to reflect webroot
ninjamonkey198206 Jul 5, 2022
c4d6f38
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 5, 2022
79378e5
Removed extra quote
ninjamonkey198206 Jul 5, 2022
49d9d17
Fixes for dns cert renewal
ninjamonkey198206 Jul 6, 2022
1b3442b
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 6, 2022
9c2c496
Fix for install repos for 22.04 and 11
ninjamonkey198206 Jul 6, 2022
813e76d
Updated troubleshooting functions for webroot
ninjamonkey198206 Jul 7, 2022
f98b640
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 7, 2022
a1dae7f
testing logging commands
ninjamonkey198206 Jul 7, 2022
356c5af
Merge branch 'develop-installer-update-ws' of https://github.com/ninj…
ninjamonkey198206 Jul 7, 2022
acc4441
testing logging
ninjamonkey198206 Jul 7, 2022
dd646ce
more logging
ninjamonkey198206 Jul 7, 2022
30de847
switched to apt-get to make apt shut up
ninjamonkey198206 Jul 7, 2022
856354b
Hopefully last edits for logging
ninjamonkey198206 Jul 7, 2022
faae154
added missing logging
ninjamonkey198206 Jul 7, 2022
3a14ad9
attempting fixes for logging
ninjamonkey198206 Jul 7, 2022
b94abf1
same as last
ninjamonkey198206 Jul 7, 2022
3c00ceb
more fixes to logging
ninjamonkey198206 Jul 7, 2022
2d7c072
another fix for logging
ninjamonkey198206 Jul 7, 2022
6f6f7c7
Please be the last logging fixes
ninjamonkey198206 Jul 7, 2022
29edc1c
removed logging for remaining python issues
ninjamonkey198206 Jul 7, 2022
35df391
removed checks and text for 4222
ninjamonkey198206 Jul 7, 2022
0fc1b04
changed name of preinstall log
ninjamonkey198206 Jul 7, 2022
e20357d
Reverted to resolvectl for dns discovery
ninjamonkey198206 Jul 7, 2022
f358e03
Fix for issues with update to openssl
ninjamonkey198206 Jul 7, 2022
7bc3022
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 7, 2022
f834d62
formatting edits for logging, was ugly af
ninjamonkey198206 Jul 7, 2022
1dce20d
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 8, 2022
03abc21
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 9, 2022
d6e9194
Updated to match current default nginx config
ninjamonkey198206 Jul 9, 2022
0843ea2
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 10, 2022
2d3beb4
Deleting unnecessary file
ninjamonkey198206 Jul 10, 2022
cb9794a
Add commenting to various functions
ninjamonkey198206 Jul 12, 2022
c247664
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 13, 2022
e33daa3
added cli arg for sudo password
ninjamonkey198206 Jul 13, 2022
e4d6474
Added removal of history logging of sudo password
ninjamonkey198206 Jul 13, 2022
8618000
Added commands to extend sudo timeout for auto
ninjamonkey198206 Jul 13, 2022
c7f4a43
Added second history wipe to remove passwd
ninjamonkey198206 Jul 13, 2022
af93a8e
Removed 22.04 options
ninjamonkey198206 Jul 13, 2022
3a9f783
Fixed webroot automated install
ninjamonkey198206 Jul 13, 2022
9d8757e
changes to make sudo password optional for cli
ninjamonkey198206 Jul 13, 2022
05b082b
tweaking cpu check verbage
silversword411 Jul 15, 2022
82fda9f
sys newline
silversword411 Jul 15, 2022
a7daf63
Fixes per shellscript checker
ninjamonkey198206 Jul 15, 2022
3d070da
Merge branch 'develop-installer-update-ws' of https://github.com/ninj…
ninjamonkey198206 Jul 15, 2022
461e862
cleaned up extra whitespaces
ninjamonkey198206 Jul 15, 2022
a99283a
Updates to error text
ninjamonkey198206 Jul 15, 2022
586e760
Change file names
ninjamonkey198206 Jul 15, 2022
040305f
Added backups for existing nginx confs
ninjamonkey198206 Jul 15, 2022
152e405
changes to script and cfg updates
ninjamonkey198206 Jul 15, 2022
f14131c
include dates in nginx backups
ninjamonkey198206 Jul 15, 2022
8150898
Added date to nginx.conf install backup
ninjamonkey198206 Jul 16, 2022
2155f45
Update to nginx.conf default file
ninjamonkey198206 Jul 16, 2022
dc74b42
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 18, 2022
31caf7f
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 19, 2022
72d9b9a
Corrected repo to current branch
ninjamonkey198206 Jul 19, 2022
558a2fd
Moved default nginx conf config for install
ninjamonkey198206 Jul 19, 2022
373b5b4
Merge pull request #19 from ninjamonkey198206/develop-installer-updat…
ninjamonkey198206 Jul 19, 2022
9025f62
merged json case change
ninjamonkey198206 Jul 19, 2022
099b1ca
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jul 20, 2022
8f54781
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 20, 2022
be88cc7
Added fix from niceguyit for daphne power failure
ninjamonkey198206 Jul 20, 2022
4ffa2da
Merge branch 'develop-installer-update-ws' of https://github.com/ninj…
ninjamonkey198206 Jul 20, 2022
5ef8c40
Updated nginx.conf to match ansible config
ninjamonkey198206 Jul 21, 2022
0dddac8
Merge pull request #20 from ninjamonkey198206/develop-installer-updat…
ninjamonkey198206 Jul 21, 2022
be8b46f
testing env files and fix for nats json format
ninjamonkey198206 Jul 21, 2022
a215d0f
undoing utils.py change
ninjamonkey198206 Jul 21, 2022
218e49c
trying different nats py method
ninjamonkey198206 Jul 22, 2022
2481fcc
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jul 26, 2022
b4ded7f
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 26, 2022
244903b
Removing support for Debian 10
ninjamonkey198206 Jul 27, 2022
5906bfd
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jul 27, 2022
e9463ec
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 27, 2022
fa02b2a
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Jul 29, 2022
a97f349
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Jul 29, 2022
e373473
Updated to support nginx repo and resolve issues
ninjamonkey198206 Jul 30, 2022
110c851
Merge branch 'develop-installer-update-ws' of https://github.com/ninj…
ninjamonkey198206 Jul 30, 2022
8f386a9
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Aug 2, 2022
efbc123
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Aug 2, 2022
3155253
Updates to allow for webroot cert during backup
ninjamonkey198206 Aug 4, 2022
ff6b478
fixes for new nginx repo
ninjamonkey198206 Aug 4, 2022
7a5f558
Order of ops fixes for default conf files
ninjamonkey198206 Aug 4, 2022
30b719e
Fixes to restore and update for webroot method
ninjamonkey198206 Aug 5, 2022
d83ec58
removed unnecessary symlink creations
ninjamonkey198206 Aug 5, 2022
e3b8c15
Fix for postgres import?...
ninjamonkey198206 Aug 5, 2022
bfec7d6
change to restore postgres database import
ninjamonkey198206 Aug 5, 2022
fdb877a
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Aug 5, 2022
5e0ab9d
Merge branch 'amidaware:develop' into develop-installer-update-ws
ninjamonkey198206 Aug 5, 2022
2cd2827
Updated ram requirement to 3GB
ninjamonkey198206 Aug 5, 2022
6b2f98e
script and cfg message update
ninjamonkey198206 Aug 5, 2022
d480523
Merge pull request #22 from ninjamonkey198206/develop-installer-updat…
ninjamonkey198206 Aug 5, 2022
5630f77
Added Ubuntu 22.04 Mongodb support
ninjamonkey198206 Aug 5, 2022
58f8c0d
Merge pull request #23 from ninjamonkey198206/develop-installer-updat…
ninjamonkey198206 Aug 5, 2022
efd322c
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Aug 5, 2022
dce21f9
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Aug 12, 2022
2bb9351
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Aug 14, 2022
0a09cfc
Merge branch 'amidaware:develop' into develop-installer-update
ninjamonkey198206 Aug 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,8 @@
"usePlaceholders": true,
"completeUnimported": true,
"staticcheck": true
},
"files.associations": {
"*.cfg": "shellscript"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ class Command(BaseCommand):
help = "Collection of tasks to run after updating the rmm, before migrations"

def handle(self, *args, **kwargs):
self.stdout.write(self.style.WARNING("Clearning the cache"))
self.stdout.write(self.style.WARNING("Clearing the cache"))
clear_entire_cache()
self.stdout.write(self.style.SUCCESS("Cache was cleared!"))
2 changes: 1 addition & 1 deletion api/tacticalrmm/tacticalrmm/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def reload_nats() -> None:

conf = os.path.join(settings.BASE_DIR, "nats-rmm.conf")
with open(conf, "w") as f:
json.dump(config, f)
json.dump(config, f, indent=4)

if not settings.DOCKER_BUILD:
time.sleep(0.5)
Expand Down
16 changes: 16 additions & 0 deletions default-configs/celery/celery.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CELERYD_NODES="w1"

CELERY_BIN="/rmm/api/env/bin/celery"

CELERY_APP="tacticalrmm"

CELERYD_MULTI="multi"

CELERYD_OPTS="--time-limit=86400 --autoscale=20,2"

CELERYD_PID_FILE="/rmm/api/tacticalrmm/%n.pid"
CELERYD_LOG_FILE="/var/log/celery/%n%I.log"
CELERYD_LOG_LEVEL="ERROR"

CELERYBEAT_PID_FILE="/rmm/api/tacticalrmm/beat.pid"
CELERYBEAT_LOG_FILE="/var/log/celery/beat.log"
34 changes: 34 additions & 0 deletions default-configs/mesh/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"settings": {
"cert": "mesh.example.com",
"mongoDb": "mongodb://127.0.0.1:27017",
"mongoDbName": "meshcentral",
"WANonly": true,
"minify": 1,
"port": 4443,
"agentAliasPort": 443,
"aliasPort": 443,
"allowLoginToken": true,
"allowFraming": true,
"_agentPing": 60,
"agentPong": 300,
"allowHighQualityDesktop": true,
"tlsOffload": "127.0.0.1",
"agentCoreDump": false,
"compression": true,
"wsCompression": true,
"agentWsCompression": true,
"maxInvalidLogin": { "time": 5, "count": 5, "coolofftime": 30 }
},
"domains": {
"": {
"title": "Tactical RMM",
"title2": "Tactical RMM",
"newAccounts": false,
"certUrl": "https://mesh.example.com:443/",
"geoLocation": true,
"cookieIpCheck": false,
"mstsc": true
}
}
}
41 changes: 41 additions & 0 deletions default-configs/nginx/frontend.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
server {
listen 80;
listen [::]:80;
server_name rmm.example.com;

#location /.well-known/acme-challenge/ {
#root /var/www/letsencrypt/;
#}

location / {
return 301 https://$host$request_uri;
}
}

server {
listen 443 ssl;
listen [::]:443 ssl;
server_name rmm.example.com;
charset utf-8;
location / {
root /var/www/rmm/dist;
try_files $uri $uri/ /index.html;
add_header Cache-Control "no-store, no-cache, must-revalidate";
add_header Pragma "no-cache";
}
error_log /var/log/nginx/frontend-error.log;
access_log /var/log/nginx/frontend-access.log;

ssl_certificate /etc/letsencrypt/live/rootdomain/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/rootdomain/privkey.pem;

ssl_protocols TLSv1.2 TLSv1.3;
ssl_prefer_server_ciphers on;
ssl_dhparam /etc/ssl/certs/dhparam.pem;
ssl_ciphers EECDH+AESGCM:EDH+AESGCM;
ssl_ecdh_curve secp384r1;
ssl_stapling on;
ssl_stapling_verify on;
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
add_header X-Content-Type-Options nosniff;
}
47 changes: 47 additions & 0 deletions default-configs/nginx/meshcentral.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
server {
listen 80;
listen [::]:80;
server_name mesh.example.com;

#location /.well-known/acme-challenge/ {
#root /var/www/letsencrypt/;
#}

location / {
return 301 https://$host$request_uri;
}
}

server {
listen 443 ssl;
listen [::]:443 ssl;
proxy_send_timeout 330s;
proxy_read_timeout 330s;
server_name mesh.example.com;
ssl_certificate /etc/letsencrypt/live/rootdomain/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/rootdomain/privkey.pem;

ssl_session_cache shared:WEBSSL:10m;

ssl_protocols TLSv1.2 TLSv1.3;
ssl_prefer_server_ciphers on;
ssl_dhparam /etc/ssl/certs/dhparam.pem;
ssl_ciphers EECDH+AESGCM:EDH+AESGCM;
ssl_ecdh_curve secp384r1;
ssl_stapling on;
ssl_stapling_verify on;
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
add_header X-Content-Type-Options nosniff;

location / {
proxy_pass http://127.0.0.1:4443/;
proxy_http_version 1.1;

proxy_set_header Host $host;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
}
25 changes: 25 additions & 0 deletions default-configs/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
worker_rlimit_nofile 1000000;
user www-data;
worker_processes auto;
pid /run/nginx.pid;
include /etc/nginx/modules-enabled/*.conf;

events {
worker_connections 4096;
}

http {
sendfile on;
tcp_nopush on;
types_hash_max_size 2048;
server_names_hash_bucket_size 64;
include /etc/nginx/mime.types;
default_type application/octet-stream;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_prefer_server_ciphers on;
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log;
gzip on;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
}
88 changes: 88 additions & 0 deletions default-configs/nginx/rmm.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
server_tokens off;

upstream tacticalrmm {
server unix:////rmm/api/tacticalrmm/tacticalrmm.sock;
}

map $http_user_agent $ignore_ua {
"~python-requests.*" 0;
"~go-resty.*" 0;
default 1;
}

server {
listen 80;
listen [::]:80;
server_name api.example.com;

#location /.well-known/acme-challenge/ {
#root /var/www/letsencrypt/;
#}

location / {
return 301 https://$host$request_uri;
}
}

server {
listen 443 ssl reuseport;
listen [::]:443 ssl;
server_name api.example.com;
client_max_body_size 300M;
access_log /rmm/api/tacticalrmm/tacticalrmm/private/log/access.log combined if=$ignore_ua;
error_log /rmm/api/tacticalrmm/tacticalrmm/private/log/error.log;
ssl_certificate /etc/letsencrypt/live/rootdomain/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/rootdomain/privkey.pem;

ssl_protocols TLSv1.2 TLSv1.3;
ssl_prefer_server_ciphers on;
ssl_dhparam /etc/ssl/certs/dhparam.pem;
ssl_ciphers EECDH+AESGCM:EDH+AESGCM;
ssl_ecdh_curve secp384r1;
ssl_stapling on;
ssl_stapling_verify on;
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
add_header X-Content-Type-Options nosniff;

location /static/ {
root /rmm/api/tacticalrmm;
}

location /private/ {
internal;
add_header "Access-Control-Allow-Origin" "https://rmm.example.com";
alias /rmm/api/tacticalrmm/tacticalrmm/private/;
}

location ~ ^/ws/ {
proxy_pass http://unix:/rmm/daphne.sock;

proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";

proxy_redirect off;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $server_name;
}

location ~ ^/natsws {
proxy_pass http://127.0.0.1:9235;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

location / {
uwsgi_pass tacticalrmm;
include /etc/nginx/uwsgi_params;
uwsgi_read_timeout 300s;
uwsgi_ignore_client_abort on;
}
}
25 changes: 25 additions & 0 deletions default-configs/python/local_settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
SECRET_KEY = "DJANGO_SEKRET"

DEBUG = False

ALLOWED_HOSTS = ["api.example.com"]

ADMIN_URL = "ADMINURL/"

CORS_ORIGIN_WHITELIST = ["https://rmm.example.com"]

DATABASES = {
"default": {
"ENGINE": "django.db.backends.postgresql",
"NAME": "tacticalrmm",
"USER": "pgusername",
"PASSWORD": "pgpw",
"HOST": "localhost",
"PORT": "5432",
}
}

MESH_USERNAME = "meshusername"
MESH_SITE = "https://mesh.example.com"
REDIS_HOST = "localhost"
ADMIN_ENABLED = True
24 changes: 24 additions & 0 deletions default-configs/uwsgi/app.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[uwsgi]
chdir = /rmm/api/tacticalrmm
module = tacticalrmm.wsgi
home = /rmm/api/env
master = true
enable-threads = true
socket = /rmm/api/tacticalrmm/tacticalrmm.sock
harakiri = 300
chmod-socket = 660
buffer-size = 65535
vacuum = true
die-on-term = true
max-requests = 500
disable-logging = true
cheaper-algo = busyness
cheaper = 4
cheaper-initial = 4
workers = 20
cheaper-step = 2
cheaper-overload = 3
cheaper-busyness-min = 5
cheaper-busyness-max = 10
# stats = /tmp/stats.socket # uncomment when debugging
# cheaper-busyness-verbose = true # uncomment when debugging
Loading