Update Web app general
This commit is contained in:
parent
086b26383f
commit
e2e6eead78
@ -1,30 +1,54 @@
|
|||||||
## Setup of web server
|
## Setup of web server
|
||||||
Two instances of photodiag-web server are hosted on sf-phmon-01.psi.ch virtual machine, both available only from beamline networks/control rooms:
|
|
||||||
- https://sf-photodiag.psi.ch (main server)
|
Two instances of the **photodiag-web** server are hosted on the **sf-phmon-01.psi.ch** virtual machine, both accessible only from the beamline networks/control rooms:
|
||||||
- https://sf-photodiag-test.psi.ch (test server)
|
|
||||||
|
- **Production server**: [https://sf-photodiag.psi.ch](https://sf-photodiag.psi.ch)
|
||||||
|
- **Test server**: [https://sf-photodiag-test.psi.ch](https://sf-photodiag-test.psi.ch)
|
||||||
|
|
||||||
### Server updates
|
### Server updates
|
||||||
The service is hosted at https://gitlab.psi.ch/photon-diagnostics/photodiag_web
|
|
||||||
- Pushing a commit on the main branch will update the test server
|
|
||||||
- Pushing a tagged commit on the main branch will update both the test and prod servers.
|
|
||||||
|
|
||||||
To push a release to the main server
|
- The service repository is hosted at: [https://gitlab.psi.ch/photon-diagnostics/photodiag_web](https://gitlab.psi.ch/photon-diagnostics/photodiag_web)
|
||||||
1. git pull the latest tested and operational version
|
- **Pushing a commit** on the `main` branch updates the **test server**.
|
||||||
1. python make_release.py <patch/minor/major>
|
- **Pushing a tagged commit** on the `main` branch updates **both** the test and production servers.
|
||||||
1. git push origin main --tags
|
|
||||||
|
|
||||||
The release status can be checked via gitlab CI/CD pipelines
|
To push a **release** to the main server:
|
||||||
|
|
||||||
|
1. Pull the latest tested and operational version:
|
||||||
|
|
||||||
|
git pull
|
||||||
|
|
||||||
|
2. Create a new release (choose one of `patch`, `minor`, or `major`):
|
||||||
|
|
||||||
|
python make_release.py patch
|
||||||
|
|
||||||
|
3. Push the new tag(s):
|
||||||
|
|
||||||
|
git push origin main --tags
|
||||||
|
|
||||||
|
You can check the release status via **GitLab CI/CD pipelines**.
|
||||||
|
|
||||||
### Server logs
|
### Server logs
|
||||||
|
|
||||||
When on either sf-phmon-01 or sf-phmon-02 use the following:
|
When logged into either **sf-phmon-01** or **sf-phmon-02**, you can view logs with:
|
||||||
|
|
||||||
`sudo journalctl -u photodiag-<test|prod> -e `
|
sudo journalctl -u photodiag-<test|prod> -e
|
||||||
|
|
||||||
use either `test` or `prod`
|
Replace `<test|prod>` with the desired instance.
|
||||||
|
|
||||||
|
For example, to see the last 100 lines of logs on **sf-phmon-02**:
|
||||||
|
|
||||||
```
|
|
||||||
ssh sf-phmon-02
|
ssh sf-phmon-02
|
||||||
sudo -i
|
sudo -i
|
||||||
journalctl -u photodiag-test.service -n 100
|
journalctl -u photodiag-test.service -n 100
|
||||||
```
|
|
||||||
this will show the last 100 lines
|
### Restarting the VM or the service
|
||||||
|
|
||||||
|
1. **Restart the entire VM**:
|
||||||
|
|
||||||
|
sudo reboot
|
||||||
|
|
||||||
|
2. **Restart a single service** (for example, photodiag test or prod):
|
||||||
|
|
||||||
|
sudo systemctl restart <service_name>.service
|
||||||
|
|
||||||
|
Replace `<service_name>` with `photodiag-test` or `photodiag-prod`.
|
Loading…
x
Reference in New Issue
Block a user