From bec8233aad1d53e7b54fe3b57b42cc4d96268e7a Mon Sep 17 00:00:00 2001 From: Jett <55758076+Jettford@users.noreply.github.com> Date: Sat, 31 Dec 2022 04:14:08 +0000 Subject: [PATCH 1/4] Update README and document WSGI file more. --- README.md | 46 ++++++++++++++++++++++++---------------------- entrypoint.bat | 2 ++ wsgi.py | 16 ++++++++++++---- 3 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 entrypoint.bat diff --git a/README.md b/README.md index d1f4166..eb03ac7 100644 --- a/README.md +++ b/README.md @@ -69,17 +69,16 @@ # Deployment > **NOTE: This tutorial assumes you have a working DLU server instance and** -> **some knowledge of Linux** +> **some knowledge of command line interfaces on your chosen platform** -**It is highly recommended to setup a reverse proxy via nginx or some other tool and use ssl to secure your nexus dashboard instance** - * [How to setup nginx](https://www.digitalocean.com/community/tutorials/how-to-configure-nginx-as-a-reverse-proxy-on-ubuntu-22-04) - * [How to use certbot for ssl](https://www.digitalocean.com/community/tutorials/how-to-secure-nginx-with-let-s-encrypt-on-ubuntu-22-04) +**It is highly recommended to setup a reverse proxy via Nginx or some other tool and use SSL to secure your Nexus Dashboard instance if you are going to be opening it up to any non-LANs** + * [How to setup Nginx](https://www.digitalocean.com/community/tutorials/how-to-configure-nginx-as-a-reverse-proxy-on-ubuntu-22-04) + * [How to use certbot for SSL](https://www.digitalocean.com/community/tutorials/how-to-secure-nginx-with-let-s-encrypt-on-ubuntu-22-04) ## Docker ```bash - docker run -d \ -e APP_SECRET_KEY='' \ -e APP_DATABASE_URI='mysql+pymysql://:@:/' \ @@ -89,7 +88,6 @@ docker run -d \ -v /path/to/unpacked/client:/app/luclient:rw \ -v /path/to/cachedir:/app/cache:rw \ aronwk/nexus-dashboard:latest - ``` * `/app/luclient` must be mapped to the location of an unpacked client @@ -106,37 +104,41 @@ Please Reference `app/settings_exmaple.py` to see all the variables * APP_DATABASE_URI (Must be provided) * Everything else is optional and has defaults -## Manual +## Manual Linux Installation Thanks to [HailStorm32](https://github.com/HailStorm32) for this manual install guide! + ### Setting Up The Environment -First you will want to install the following packages by executing the following commands +First you will want to install the following packages by executing the following commands presuming you are on a Debian based system. + `sudo apt-get update` + `sudo apt-get install -y python3 python3-pip sqlite3 git unzip libmagickwand-dev` > *Note: If you are having issues with installing `sqlite3`, change it to `sqlite`*
-Next we will clone the repository. You can clone it anywhere, but for the purpose of this tutorial, we will be cloning it to the home directory. +Next you will want to clone the repository. You can clone it anywhere, but for the purpose of this tutorial, we will be cloning it to the home directory.' +

-`cd` *make sure you are in the home directory* +Run `cd ~` to ensure that you are currently in the home directory then run the following command to clone the repository into our home directory `git clone https://github.com/DarkflameUniverse/NexusDashboard.git` -You should now have a directory called `NexusDashboard` +You should now have a directory called `NexusDashboard` present in your home directory ### Setting up Rename the example settings file `cp ~/NexusDashboard/app/settings_example.py ~/NexusDashboard/app/settings.py` -Now let's open the settings file we just created and configure some of the settings -`vim ~/NexusDashboard/app/settings.py` ->*Feel free to use any text editor you are more comfortable with instead of vim* +Now let's open the settings file we just created and configure some of the settings with nano as it is a simple text editor that is easy to use +`nano ~/NexusDashboard/app/settings.py` +>*Obviously you can replace this with a text editor of your choice, nano is just the most simple to use out of the ones available by default on most Linux distros*
-Inside this file is where you can change certain settings like user registration, email support and other things. In this tutorial I will only be focusing on the bare minimum to get up and running, but feel free to adjust what you would like +Inside this file is where you can change certain settings like user registration, email support and other things. In this tutorial we will only be focusing on the bare minimum to get up and running, but feel free to adjust what you would like to fit your needs. ->*Note: Enabling the email option will require further setup that is outside the scope of this tutorial* +>*Note: There are options in here that are related to email registration and password recovery among other features however those require extra setup not covered by this tutorial* The two important settings to configure are `APP_SECRET_KEY` and `APP_DATABASE_URI` @@ -180,7 +182,7 @@ Put the two folders in `~/NexusDashboard/app/luclient` Unzip the `brickdb.zip` in place `unzip brickdb.zip` -Remove the `.zip` after you have unzipped it +Remove the `.zip` file after you have unzipped it, you can do that with `rm brickdb.zip` In the `luclient` directory you should now have a file structure that looks like this @@ -207,14 +209,14 @@ res We will also need to copy the `CDServer.sqlite` database file from the server to the `~/NexusDashboard/app/luclient/res` folder -Once the file is moved over, you will need to rename it to `cdclient.sqlite` +Once the file is moved over, you will need to rename it to `cdclient.sqlite`, this can be done with the following command ```bash mv ~/NexusDashboard/app/luclient/res/CDServer.sqlite ~/NexusDashboard/app/luclient/res/cdclient.sqlite ``` ##### Remaining Setup -Run the following commands one at a time +To finish this, we will need to install the python dependencies and run the database migrations, simply run the following commands one at a time ```bash cd ~/NexusDashboard pip install -r requirements.txt @@ -222,11 +224,11 @@ pip install gunicorn flask db upgrade ``` ##### Running the site -You can run the site with +Once all of the above is complete, you can run the site with the command `gunicorn -b :8000 -w 4 wsgi:app` # Development -Please use [Editor Config](https://editorconfig.org/) +Please use [Editor Config](https://editorconfig.org/) to maintain a consistent coding style between different editors and different contributors. - * `flask run` to run local dev server + * `python3 -m flask run` to run a local dev server diff --git a/entrypoint.bat b/entrypoint.bat new file mode 100644 index 0000000..9e0119e --- /dev/null +++ b/entrypoint.bat @@ -0,0 +1,2 @@ +python3 -m flask db upgrade +python3 wsgi.py diff --git a/wsgi.py b/wsgi.py index 9096484..af30ac4 100644 --- a/wsgi.py +++ b/wsgi.py @@ -1,19 +1,23 @@ - +from sys import platform from app import create_app app = create_app() - @app.shell_context_processor def make_shell_context(): """Extend the Flask shell context.""" return {'app': app} +running_directly = __name__ == "__main__" +running_under_gunicorn = not running_directly and 'gunicorn' in __name__ and 'linux' in platform -if __name__ == '__main__': +# Configure development running +if running_directly: with app.app_context(): app.run(host='0.0.0.0') -else: + +# Configure production running +if running_under_gunicorn: import logging from logging.handlers import RotatingFileHandler gunicorn_logger = logging.getLogger('gunicorn.error') @@ -23,3 +27,7 @@ else: file_handler.setFormatter(formatter) app.logger.addHandler(file_handler) app.logger.setLevel(gunicorn_logger.level) + +# Error out if nothing has been setup +if not running_directly and not running_under_gunicorn: + raise RuntimeError('Unsupported WSGI server') From 99087eb30ab2b8577d8b6211746b371b73864db3 Mon Sep 17 00:00:00 2001 From: Jett <55758076+Jettford@users.noreply.github.com> Date: Sat, 31 Dec 2022 04:37:42 +0000 Subject: [PATCH 2/4] Add Windows documentation --- README.md | 144 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 122 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index eb03ac7..b49f9fe 100644 --- a/README.md +++ b/README.md @@ -168,14 +168,15 @@ Once you are done making the changes, save and close the file We will need the following folders from the client ``` -locale (all of the files inside) +locale +└───locale.xml res -|_BrickModels -|_brickprimitives -|_textures -|_ui -|_brickdb.zip +├───BrickModels +├───brickprimitives +├───textures +├───ui +├───brickdb.zip ``` Put the two folders in `~/NexusDashboard/app/luclient` @@ -187,24 +188,24 @@ Remove the `.zip` file after you have unzipped it, you can do that with In the `luclient` directory you should now have a file structure that looks like this ``` -local -|_locale.xml +locale +└───locale.xml res -|_BrickModels - |_... -|_brickprimitives - |_... -|_textures - |_... -|_ui - |_... -|_Assemblies - |_... -|_Primitives - |_... -|_Materials.xml -|_info.xml +├───BrickModels +│ └─── ... +├───brickprimitives +│ └─── ... +├───textures +│ └─── ... +├───ui +│ └─── ... +├───Assemblies +│ └─── ... +├───Primitives +│ └─── ... +├───Materials.xml +└───info.xml ``` We will also need to copy the `CDServer.sqlite` database file from the server to the `~/NexusDashboard/app/luclient/res` folder @@ -227,6 +228,105 @@ flask db upgrade Once all of the above is complete, you can run the site with the command `gunicorn -b :8000 -w 4 wsgi:app` +## Manual Windows Setup + +While a lot of the setup on Windows is the same a lot of it can be completed with GUI interfaces and requires installing things from websites instead of the command line. + +### Setting Up The Environment +You need to install the following prerequisites: + + * [Python 3.8](https://www.python.org/downloads/release/python-380/) + * [Git](https://git-scm.com/downloads) + * [ImageMagick](https://docs.wand-py.org/en/latest/guide/install.html#install-imagemagick-on-windows) + * [7-Zip](https://www.7-zip.org/download.html) + +Next you will need to clone the repository. You can clone it anywhere, but for the purpose of this tutorial, you will want to clone it to your desktop just for simplicity, it can be moved after. + +Open a command prompt and run `cd Desktop` (The command line should place you in your Home directory be default) to ensure that you are currently in the desktop directory then run the following command to clone the repository into our desktop directory + +Run the command to clone the repository `git clone https://github.com/DarkflameUniverse/NexusDashboard.git` + +You should now have a directory called `NexusDashboard` present pn your desktop. + +### Setting up +Now you need to rename the example settings file, you can perform this manually in the GUI or you can use the command line. + + * `cd NexusDashboard\app` + * `copy settings_example.py settings.py` + +Now let's open the settings file we just created and configure some of the settings with the Windows default notepad. +* `notepad settings.py` + +Inside this file is where you can change certain settings like user registration, email support and other things. In this tutorial we will only be focusing on the bare minimum to get up and running, but feel free to adjust what you would like to fit your needs. + +> *Note: There are options in here that are related to email registration and password recovery among other features however those require extra setup not covered by this tutorial* + +The two important settings to configure are `APP_SECRET_KEY` and `APP_DATABASE_URI` + +For `APP_SECRET_KEY` you can just fill in any random 32 character string and for `APP_DATABASE_URI` you will need to fill in a connection string to your database. The connection string will look similar to this. You will need to fill in your own information for the username, password, host, port and database name. +``` +APP_DATABASE_URI = "mysql+pymysql://:@:/" +``` +and the rest of the file can be left at the default values other than the `APP_SECRET_KEY` which you will need to fill in with random characters. + +Once you are done making the changes, save and close the file + +##### Client related files +We will need the following folders from the client +``` +locale +└───locale.xml + +res +├───BrickModels +├───brickprimitives +├───textures +├───ui +└───brickdb.zip +``` +Put the two folders in `Desktop/NexusDashboard/app/luclient` + +Unzip the `brickdb.zip` in place using 7-Zip, you can do this by right clicking the file and selecting `7-Zip > Extract Here`. + +After doing this you can remove the `.zip`, simply delete the file. + +In the `luclient` directory you should now have a file structure that looks like this +``` +locale +└───locale.xml + +res +├───BrickModels +│ └─── ... +├───brickprimitives +│ └─── ... +├───textures +│ └─── ... +├───ui +│ └─── ... +├───Assemblies +│ └─── ... +├───Primitives +│ └─── ... +├───Materials.xml +└───info.xml +``` + +We will also need to copy the `CDServer.sqlite` database file from the server to the `Desktop/NexusDashboard/app/luclient/res` folder + +Once the file is moved over, you will need to rename it to `cdclient.sqlite`, this can be done by right clicking the file and selecting `Rename` and then changing the name to `cdclient.sqlite` + +##### Remaining Setup +To finish this, we will need to install the python dependencies and run the database migrations, simply run the following commands one at a time in the root directory of the site, if you are not in the root directory you can run `cd Desktop/NexusDashboard` to get there (assuming you have opened a new terminal window) +```bat +pip install -r requirements.txt +flask db upgrade +``` + +##### Running the site +Once all of the above is complete, you can run the site with the command +`flask run` however bare in mind that this is a development version of the site, at the moment running a production version of the site on Windows is not supported. + # Development Please use [Editor Config](https://editorconfig.org/) to maintain a consistent coding style between different editors and different contributors. From 9cda62cef7aea117b58292e2b41d59ac705c13fd Mon Sep 17 00:00:00 2001 From: Jett <55758076+Jettford@users.noreply.github.com> Date: Sat, 31 Dec 2022 04:39:54 +0000 Subject: [PATCH 3/4] A few mistakes --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b49f9fe..77c1896 100644 --- a/README.md +++ b/README.md @@ -244,13 +244,12 @@ Next you will need to clone the repository. You can clone it anywhere, but for t Open a command prompt and run `cd Desktop` (The command line should place you in your Home directory be default) to ensure that you are currently in the desktop directory then run the following command to clone the repository into our desktop directory -Run the command to clone the repository `git clone https://github.com/DarkflameUniverse/NexusDashboard.git` +Run the following command to clone the repository `git clone https://github.com/DarkflameUniverse/NexusDashboard.git` -You should now have a directory called `NexusDashboard` present pn your desktop. +You should now have a directory called `NexusDashboard` present on your desktop. ### Setting up -Now you need to rename the example settings file, you can perform this manually in the GUI or you can use the command line. - +Now that we have the repository cloned you need to rename the example settings file, you can perform this manually in the GUI or you can use the command line, to do the latter run the following commands * `cd NexusDashboard\app` * `copy settings_example.py settings.py` From bc6bbdfaa78d2f5ba734cf76ee8f37364db67dac Mon Sep 17 00:00:00 2001 From: Jett <55758076+Jettford@users.noreply.github.com> Date: Sat, 31 Dec 2022 04:54:46 +0000 Subject: [PATCH 4/4] I didn't break anything, what are you talking about...? --- wsgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wsgi.py b/wsgi.py index af30ac4..ec3f9b3 100644 --- a/wsgi.py +++ b/wsgi.py @@ -8,7 +8,7 @@ def make_shell_context(): """Extend the Flask shell context.""" return {'app': app} -running_directly = __name__ == "__main__" +running_directly = __name__ == "wsgi" or __name__ == "__main__" running_under_gunicorn = not running_directly and 'gunicorn' in __name__ and 'linux' in platform # Configure development running