Skip to content

Commit 46418c7

Browse files
authored
Merge pull request #6905 from nightscout/dev
Release 14.2.2 * Merge latest translations from Crowdin * Clean project root * Re-introduce a wrapper server.js in the project root
2 parents cbfae75 + 8516fe9 commit 46418c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+237
-175
lines changed

.deployment

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[config]
2-
command = bash deploy.sh
2+
command = bash bin/azure-deploy.sh

CONTRIBUTING.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
[coverage-url]: https://coveralls.io/r/nightscout/cgm-remote-monitor?branch=master
3535
[discord-img]: https://img.shields.io/discord/629952586895851530?label=discord%20chat
3636
[discord-url]: https://discord.gg/rTKhrqz
37+
[example-env-template]: docs/example-template.env
3738

3839
## Translations
3940

@@ -49,15 +50,15 @@ Nightscout is a Node.js application. The basic installation of the software for
4950
dependency installation has to be done using a non-root user - _do not use root_ for development and hosting
5051
the software!
5152
3. Get a Mongo database by either installing Mongo locally, or get a free cloud account from mLab or MongoDB Atlas.
52-
4. Configure Nightscout by copying `my.env.template` to `my.env` and run it - see the next chapter in the instructions
53+
4. Configure Nightscout by copying [`docs/example-template.env`][example-env-template] to `my.env` and run it - see the next chapter in the instructions
5354

5455
## Develop on `dev`
5556

5657
We develop on the `dev` branch. All new pull requests should be targeted to `dev`. The `master` branch is only used for distributing the latest version of the tested sources.
5758

5859
You can get the `dev` branch checked out using `git checkout dev`.
5960

60-
Once checked out, install the dependencies using `npm install`, then copy the included `my.env.template`file to `my.env` and edit the file to include your settings (like the Mongo URL). Leave the `NODE_ENV=development` line intact. Once set, run the site using `npm run dev`. This will start Nightscout in the development mode, with different code packaging rules and automatic restarting of the server using nodemon, when you save changed files on disk. The client also hot-reloads new code in, but it's recommended to reload the website after changes due to the way the plugin sandbox works.
61+
Once checked out, install the dependencies using `npm install`, then copy the included [`docs/example-template.env`][example-env-template] to `my.env` file to `my.env` and edit the file to include your settings (like the Mongo URL). Leave the `NODE_ENV=development` line intact. Once set, run the site using `npm run dev`. This will start Nightscout in the development mode, with different code packaging rules and automatic restarting of the server using nodemon, when you save changed files on disk. The client also hot-reloads new code in, but it's recommended to reload the website after changes due to the way the plugin sandbox works.
6162

6263
Note the template sets `INSECURE_USE_HTTP` to `true` to enable the site to work over HTTP in local development.
6364

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md)
5050
[discord-url]: https://discord.gg/rTKhrqz
5151
[heroku-img]: https://www.herokucdn.com/deploy/button.png
5252
[heroku-url]: https://heroku.com/deploy?template=https://github.com/nightscout/cgm-remote-monitor
53-
[update-img]: update.png
53+
[update-img]: docs/update.png
5454
[update-fork]: http://nightscout.github.io/pages/update-fork/
5555
[original]: https://github.com/rnpenguin/cgm-remote-monitor
5656

@@ -164,7 +164,7 @@ Some features may not work with devices/browsers on the older end of these requi
164164

165165
## Windows installation software requirements:
166166

167-
- [Node.js](http://nodejs.org/) Latest Node 12 LTS. Node versions that do not have the latest security patches will not work. Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or use `setup.sh`)
167+
- [Node.js](http://nodejs.org/) Latest Node 12 LTS. Node versions that do not have the latest security patches will not work. Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or use `bin/setup.sh`)
168168
- [MongoDB](https://www.mongodb.com/download-center?jmp=nav#community) 3.x or later. MongoDB 2.4 is only supported for Raspberry Pi.
169169

170170
As a non-root user clone this repo then install dependencies into the root of the project:
@@ -670,7 +670,7 @@ For remote overrides, the following extended settings must be configured:
670670
* `target_high` - Upper target for correction boluses.
671671
* `target_low` - Lower target for correction boluses.
672672

673-
Some example profiles are [here](example-profiles.md).
673+
Some example profiles are [here](docs/plugins/example-profiles.md).
674674

675675
## Setting environment variables
676676
Easy to emulate on the commandline:
@@ -690,13 +690,13 @@ Your hosting provider probably has a way to set these through their GUI.
690690
### Vagrant install
691691

692692
Optionally, use [Vagrant](https://www.vagrantup.com/) with the
693-
included `Vagrantfile` and `setup.sh` to install OS and node packages to
693+
included `Vagrantfile` and `bin/setup.sh` to install OS and node packages to
694694
a virtual machine.
695695

696696
```bash
697697
host$ vagrant up
698698
host$ vagrant ssh
699-
vm$ setup.sh
699+
vm$ ./bin/setup.sh
700700
```
701701

702702
The setup script will install OS packages then run `npm install`.

deploy.sh renamed to bin/azure-deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ echo "\"$SCM_COMMIT_ID\"" > $DEPLOYMENT_SOURCE/scm-commit-id.json
103103

104104
# 1. KuduSync
105105
if [[ "$IN_PLACE_DEPLOYMENT" -ne "1" ]]; then
106-
"$KUDU_SYNC_CMD" -v 50 -f "$DEPLOYMENT_SOURCE" -t "$DEPLOYMENT_TARGET" -n "$NEXT_MANIFEST_PATH" -p "$PREVIOUS_MANIFEST_PATH" -i ".git;.hg;.deployment;deploy.sh"
106+
"$KUDU_SYNC_CMD" -v 50 -f "$DEPLOYMENT_SOURCE" -t "$DEPLOYMENT_TARGET" -n "$NEXT_MANIFEST_PATH" -p "$PREVIOUS_MANIFEST_PATH" -i ".git;.hg;.deployment;bin/azure-deploy.sh"
107107
exitWithMessageOnError "Kudu Sync failed"
108108
fi
109109

File renamed without changes.

database_configuration.json

Lines changed: 0 additions & 4 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)