Athanasius
0c8a01fbbd
systemd/start-eddn-service: Also check for existing process for not-source
2021-07-06 12:45:38 +00:00
Athanasius
b1ceccd850
systemd/start-eddn-service: Check if process still exists
2021-07-06 11:52:43 +00:00
Athanasius
0e3ef098ab
systemd/start-eddn-service: Now replacing scripts/run-from-source.sh
...
* Removed scripts/run-from-source.sh as it's now redundant.
* Added `--background` optional argument, only for when using
`--from-source` to start-eddn-service. The script will leave the
service in the foreground, no output redirection, without it.
It tells you the PID of the process when it's backgrounded, as well as
placing it in the appropriate .pid file.
2021-07-06 11:17:52 +00:00
Athanasius
e049e2971b
systemd/start-eddn-service: Can now --from-source
...
* Also now stores PID in per-service file in configured logs directory.
* Swapped the environment arg and service so it's, e.g. "live gateway"
now.
* New optional third arg `--from-source` to... run from source, not
installed files. The script *will* exit and redirect output, but
record the PID and tell you it.
New SRC_DIR in the config files to know where to run from.
2021-07-06 10:44:44 +00:00
Athanasius
3116927b12
run-from-source: Moved into new ./scripts/ directory
2021-07-06 10:04:55 +00:00
Athanasius
4bfa81cde8
docs/Running: systemd files now in root rather than contrib/
2021-07-06 10:04:13 +00:00
Athanasius
478bf4060b
Move systemd scripts/files out of contrib into root
2021-07-06 10:03:31 +00:00
Athanasius
547ec2bc22
docs/Running: Section-ise the setup.py install section
...
* Moves the "you need to edit these files in the monitor" into a section
related to this, rather than up in #concepts.
2021-07-05 14:36:24 +00:00
Athanasius
8f36f8dcfe
contrib/run-from-source.sh: Fix up for the paths now used
2021-07-05 14:31:57 +00:00
Athanasius
50d7af3149
docs/Running: Catch up installation docs with current scripting
2021-07-05 14:16:08 +00:00
Athanasius
dd57ca3ac0
Merge pull request #124 from EDCD/enhancement/118/venv-and-setup.py
...
Generally get setup.py and docs into better shape
2021-07-05 14:53:49 +01:00
Athanasius
aa42aaf8b8
setup.py: Install the logs archivel script
2021-07-05 13:50:45 +00:00
Athanasius
1e9a5e6212
contrib: Rename logs-archive to eddn-logs-archive
2021-07-05 13:46:31 +00:00
Athanasius
f9cf414255
contrib: Log archival script
...
This will rotate to datetime stamped filenames (not a serial), and
compress. Will also only keep 28 days of logs at most.
2021-07-05 13:42:51 +00:00
Athanasius
1476ff824d
contrib/apache: Full, confirmed working, config
2021-07-05 12:56:25 +00:00
Athanasius
0bcb9cc545
docs/Running: Specify network/firewall config, correct some paths and ...
...
* <hr> between sections
* Document the ports that *must* be open to the internet.
* Apache will require the proxy_http module.
* Move the github clone earlier in instructions, as part of ensuring
paths exist when they should.
* Note about needing to do hostname and port substitutions in monitor
files if not using the standard values.
* Link to other sections where appropriate.
2021-07-05 12:52:50 +00:00
Athanasius
b1056c1239
contrib/run-from-source: Handle missing custom config
2021-07-03 14:02:35 +00:00
Athanasius
fcd316c7d4
docs/Running: Edit and expand LetsEncrypt section
2021-07-02 18:04:34 +00:00
Athanasius
de761f653b
contrib: Add LetsEncrypt example deploy script files
2021-07-02 17:34:29 +00:00
Athanasius
1df2fb749b
Relay: Add missing from bottle import ..., request, ...
2021-07-02 17:07:46 +00:00
Athanasius
1e9edf94f7
Relay: app.-ise and CORS-ise
...
* Use the "make an explicit Bottle() and use it" change.
* Use app.route with OPTIONS in method= list.
* Remove extraneous setting of Access-Control-Allow-Origin header.
2021-07-02 17:02:53 +00:00
Athanasius
9359b78301
Gateway: Correct methodS to singular & remove extraneous header
...
* methods != method
* There shouldn't be any need to manually set
Access-Control-Allow-Origin headers now.
2021-07-02 17:02:07 +00:00
Athanasius
a8b3fc33e1
Monitor: Forgot the app.install(EnableCors())
2021-07-02 16:57:06 +00:00
Athanasius
1feb7c2dee
Monitor: Converted to app. including CORS handler
2021-07-02 16:54:37 +00:00
Athanasius
2eb8a9fb88
Gateway: Implement a CORS plugin for all routes
...
* Switches all of the routes to use .route(..., method=[...]) so as to
include OPTIONS as well as either POST or GET.
2021-07-02 16:32:19 +00:00
Athanasius
c72f583476
beta: Support in systemd start-eddn-service script
2021-07-02 14:17:21 +00:00
Athanasius
a340b027fc
beta: Add systemd config
2021-07-02 14:16:36 +00:00
Athanasius
1804799507
setup: Use setup_env.py for per-environment settings
2021-07-02 14:12:43 +00:00
Athanasius
2a4f8488cd
Remove setup.cfg from git, to avoid merges over-writing any per-env changes
...
The hope is this can be used to easily switch between live, beta and dev
for setup.py without worrying that a git merge will suddenly turn beta
into dev, or live into beta or dev.
2021-07-02 13:55:25 +00:00
Athanasius
096ccab9fb
docs/Running: Outline for using Apache
2021-07-01 17:30:48 +00:00
Athanasius
7684cec4d5
.gitignore: VIM swap files
2021-07-01 17:30:37 +00:00
Athanasius
4e343fe444
docs/running: a start on apache config
2021-07-01 18:11:13 +01:00
Athanasius
8add1a4409
Merge branch 'enhancement/118/venv-and-setup.py' of github.com:EDCD/EDDN into enhancement/118/venv-and-setup.py
2021-07-01 18:10:12 +01:00
Athanasius
086493b5bf
Make it possible to split dev and live installs
...
* Have 'dev' and 'live' components to many paths and file names.
* Have separate dev/live systemd start script configs.
* Have the systemd start script take a dev/live second argument.
* Try to ensure permissions on 'web' files by explicitly setting umask.
2021-07-01 16:52:25 +00:00
Athanasius
451b93db1d
docs/Running: Correct placement of "Reverse Proxy with nginx" section
2021-07-01 15:41:44 +01:00
Athanasius
2c06b8e79e
systemd: start script - exec the python
2021-06-14 17:34:34 +01:00
Athanasius
f98809fd2e
systemd: Correct AssertPathExists to python venv
2021-06-14 17:32:13 +01:00
Athanasius
d16e222a99
docs/Running: Mandate the python venv installation
...
Let's stop guessing at how the reader wants to do it and just *tell*
them how to do it instead.
Python virtual environment, done.
2021-06-14 17:12:43 +01:00
Athanasius
db7b69473b
docs/: Add example override config file
2021-06-14 17:12:28 +01:00
Athanasius
6bc7d3042d
contrib/init.d: Tweak DAEMON setting for python venv install
2021-06-14 17:08:47 +01:00
Athanasius
c6db4b2733
docs/Running: ${HOME} not ~ / python venv un-versioned symbolic link
...
* Let's stick with Bourne Shell, not BASH-isms.
* If we make everything use ~/eddn/python-venv symbolic link then
there's less to update in the future.
2021-06-14 16:52:04 +01:00
Athanasius
b58acec1c9
setup.py: Call out what we're doing in these extra steps
2021-06-14 16:45:41 +01:00
Athanasius
e8c1e3b03a
setup.py: Ensure CWD is as expected & copy example config if needs be
2021-06-14 16:42:02 +01:00
Athanasius
548f7c3cb3
setup.py: Get 'extra' files in place - monitor, schemas, systemd files
...
* 'monitor' files are for the web page showing status/stats.
* 'schema' files are a publically available copy of the schemas in-use.
* 'systemd' files are the start-<service> script and its config file.
2021-06-14 16:30:11 +01:00
Athanasius
152bd86818
setup.py: A little reformatting for readability
2021-06-14 15:55:49 +01:00
Athanasius
4c2f379480
contrib/systemd: Adjusted service file and script for python venv
2021-06-14 15:52:39 +01:00
Athanasius
415f5bb17d
systemd: Change to a single script for starting services
...
* Pass the EDDN service to be started as $1.
* eddn_config now defines a python venv activate script to use.
* And this new central script uses that.
2021-06-14 15:22:58 +01:00
Athanasius
165a00599f
docs/Running: We should use a python venv
2021-06-14 15:15:10 +01:00
Athanasius
4edb1e7e21
setup.py: Comment about schemas only being for code, not website
2021-06-14 15:01:07 +01:00
Athanasius
f033b3621b
setup.py: Pin versions of install_requires packages
...
Yes, I know that:
<https://packaging.python.org/discussions/install-requires-vs-requirements/ >
says not to do this in install_requires. But there's at least the issue
of pyzmq's later versions just not working with python 2.7.
These are the versions we *know* work currently.
2021-06-14 14:53:54 +01:00