1
0
Fork 0
mirror of https://github.com/overleaf/toolkit.git synced 2025-04-19 15:28:06 +02:00
Commit graph

209 commits

Author SHA1 Message Date
Eric Mc Sween
9f5bd17cda Removed OAuth2 client configuration
Now that the git bridge exclusively uses personal access tokens in
ServerPro, it doesn't need to perform a password grant request and
therefore doesn't need to have its OAuth client id and secret
configured.
2023-05-24 16:15:28 -04:00
Eric Mc Sween
fd7891401b
Merge pull request #158 from overleaf/em-docker-compose-v2
Use Docker Compose v2
2023-05-23 06:09:26 -04:00
Eric Mc Sween
ae03cd3568 Properly kill logging processes when using Compose v2
When killing a `docker compose exec` process with Compose v2, the kill
signal somehow doesn't propagate to the process running inside the
container. As a workaround, we collect the PIDs from inside the
container when we start a process in the background and kill the
processes from inside the container at the end.
2023-05-19 16:29:56 -04:00
Miguel Serrano
63c5e1d5fd
Merge pull request #160 from overleaf/msm-redis-6
Update redis to 6.2 in config-seed
2023-05-18 15:29:11 +02:00
Miguel Serrano
1f50baa1dc
Update redis to 6.2 in config-seed 2023-05-18 15:24:02 +02:00
Eric Mc Sween
593b1bef29 Documentation fixes 2023-05-17 14:16:55 -04:00
Eric Mc Sween
dacc67207a Backfill changelog with recent changes 2023-05-16 16:55:21 -04:00
Eric Mc Sween
13f0e8a4db Use Docker Compose v2
By default, use Docker Compose v2, but fall back to Docker Compose v1 if
v2 is unavailable.
2023-05-16 16:45:59 -04:00
Eric Mc Sween
4353e676ee Refactor bin/docker-compose
Split the one big setup function into smaller functions organized around
the different optional docker-compose config files.
2023-05-16 15:22:14 -04:00
Eric Mc Sween
d866169025 Cleanup: properly quote docker-compose flags 2023-05-16 14:01:38 -04:00
Eric Mc Sween
2a847961ba Cleanup: no need to quote env vars inside bash conditionals 2023-05-16 13:59:52 -04:00
Eric Mc Sween
87770de818
Merge pull request #157 from overleaf/em-git-bridge-logs
Show container logs via bin/logs
2023-05-15 07:21:32 -04:00
Eric Mc Sween
2a562c1a72 Show container logs via bin/logs
Most of our service logs are found inside the sharelatex container in
/var/sharelatex/logs, but some service logs (for mongo, redis,
git-bridge) are found in the container logs. The bin/logs script can now
show both types of logs.

In addition, the -n option, which controls how many lines of logs are
output now accepts the string "all" to make it easy to show all
available logs for a given service.

This is meant to be used to easily extract logs with:

    bin/logs -n all service > service.log
2023-05-12 08:02:02 -04:00
Eric Mc Sween
01e4ed312e
Merge pull request #156 from overleaf/em-change-git-bridge-data-directory
Change the location of the git-bridge data directory
2023-05-11 07:44:18 -04:00
Eric Mc Sween
43e0c0d607 Change the location of the git-bridge data directory
The default location of the data directory inside the git-bridge
container is /tmp/wlgb, but the data it contains should not be
considered temporary. In order to avoid any misunderstanding that would
lead an administrator to delete the contents of the /tmp directory, we
move the data directory to /data/git-bridge.
2023-05-10 17:17:32 -04:00
Eric Mc Sween
1d3e729980
Merge pull request #153 from overleaf/em-mongo-replica-set
Start Mongo in a replica set by default
2023-05-01 07:08:31 -04:00
Eric Mc Sween
7924adfd79 Start Mongo in a replica set by default
Starting with Overleaf version 4, Mongo needs to be in a replica set. By
default, the replica set is made of a single instance.
2023-04-28 08:26:17 -04:00
Alf Eaton
afdac379d9
Merge pull request #149 from overleaf/ae-openssl-req-subj
Add -subj option to openssl req command
2023-04-14 09:48:58 +01:00
Eric Mc Sween
a16adb156c
Merge pull request #148 from overleaf/em-disable-git-bridge-by-default
Ensure git bridge is disabled by default
2023-04-13 07:06:13 -04:00
Alf Eaton
a58f9c0ca8 Add -subj option to openssl req command 2023-04-13 07:59:07 +01:00
Eric Mc Sween
d447061e8d Ensure git bridge is disabled by default
The config seed was mistakenly setting the GIT_BRIDGE_ENABLED variable
to true rather than false. We want git bridge to be enabled manually
because users also have to set a secret for it to work correctly.
2023-04-12 16:08:52 -04:00
Eric Mc Sween
e93dfe9977
Merge pull request #146 from overleaf/tm-em-msm-git-bridge-server-pro
Support git bridge in Server Pro
2023-04-10 11:03:57 -04:00
Eric Mc Sween
5971ffc5d4 Check Server Pro version before starting git bridge 2023-04-03 15:38:02 -04:00
Eric Mc Sween
19ee1e19b7 Add support for git bridge proxy
Instead of being available at http://localhost:8000/, the git bridge
will be available at http://localhost/git/
2023-03-30 14:41:30 -04:00
Thomas Mees
3a7d5c6676 Support git bridge in Server Pro
This adds a new docker compose configuration for git bridge. This
configuration is loaded only when GIT_BRIDGE_ENABLED is set to true in
config/overleaf.rc

Co-authored-by: Thomas Mees <thomas.mees@overleaf.com>
2023-03-30 11:42:07 -04:00
Jakob Ackermann
d33afcd60d
Merge pull request #144 from overleaf/jpa-3-5-5
Updated seed version to 3.5.5
2023-03-21 17:06:38 +00:00
Jakob Ackermann
40ed7464db
Updated seed version to 3.5.5 2023-03-21 16:54:50 +00:00
Jakob Ackermann
c393bd7fd1
Merge pull request #143 from overleaf/jpa-3-5-4
Updated seed version to 3.5.4
2023-03-20 15:37:11 +00:00
Jakob Ackermann
6c7119025b
Updated seed version to 3.5.4 2023-03-20 15:02:08 +00:00
siaimes
e9d1657cc5
Allow users to customize the image address. (#138)
* Allow users to customize the image address.

Signed-off-by: siaimes <34199488+siaimes@users.noreply.github.com>

* Change IMAGE_NAME to SHARELATEX_IMAGE_REPO and commented out it by default.

Signed-off-by: siaimes <34199488+siaimes@users.noreply.github.com>

* Change SHARELATEX_IMAGE_REPO to SHARELATEX_IMAGE_NAME.

Signed-off-by: siaimes <34199488+siaimes@users.noreply.github.com>

---------

Signed-off-by: siaimes <34199488+siaimes@users.noreply.github.com>
2023-03-20 10:25:47 +01:00
Miguel Serrano
4204bad426
Merge pull request #142 from overleaf/msm-seed-3-5-3
Updated seed version to 3.5.3
2023-03-16 18:11:07 +01:00
Miguel Serrano
f6e18c93d8 Updated seed version to 3.5.3 2023-03-16 18:07:05 +01:00
Miguel Serrano
3242dcc9b2
Merge pull request #139 from overleaf/msm-hotfix-3-5-2
Updated config seed to 3.5.2
2023-03-07 16:04:44 +01:00
Miguel Serrano
a67d4d17b0 Updated config seed to 3.5.2 2023-03-07 16:03:24 +01:00
Miguel Serrano
56e7bf4348
Update version seed to 3.5.1 (#134)
* Update version seed to 3.5.1

* Add CHANGELOG entry for 3.5.1

---------

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
2023-03-06 12:47:54 +01:00
Jakob Ackermann
423463d2c1
Merge pull request #136 from overleaf/jpa-changelog
Add historic CHANGELOG entries
2023-03-06 11:45:40 +00:00
Jakob Ackermann
4bf26a177f
Add historic CHANGELOG entries 2023-03-06 11:02:34 +00:00
Jakob Ackermann
69c04ffaaa
Merge pull request #130 from overleaf/jpa-s3
[misc] add variables for S3 and let doctor flag an incomplete S3 config
2023-03-06 10:27:44 +00:00
Jakob Ackermann
49460cbfec
[bin/doctor] flag incomplete S3 config 2023-02-28 14:27:24 +00:00
Jakob Ackermann
c64acdc335
[config-seed] add variables for S3 2023-02-28 14:27:21 +00:00
Miguel Serrano
712f43df85
Merge pull request #133 from overleaf/msm-rollback-seed-version
Update version
2023-02-10 18:28:57 +01:00
Miguel Serrano
05cf6ef907
Update version 2023-02-10 18:24:59 +01:00
Miguel Serrano
c834ece771
added SIGKILL timeouts for docker (#132) 2023-02-10 17:24:15 +01:00
Miguel Serrano
496027361c
Merge pull request #131 from overleaf/msm-3-5-0
Updated config-seed to 3.5.0
2023-02-10 16:20:02 +01:00
Miguel Serrano
548b301b9e Updated config-seed to 3.5.0 2023-02-10 13:06:04 +01:00
Miguel Serrano
5da38a9b0a
Merge pull request #128 from overleaf/msm-version-3-4-0
Updated config seed version to 3.4.0
2023-01-11 16:21:54 +01:00
Miguel Serrano
c08a727f3c
Updated config seed version to 3.4.0 2023-01-11 16:14:19 +01:00
Jakob Ackermann
27057d49fc
Merge pull request #122 from overleaf/jpa-upgrading-from-0.x
[docs] extend docs for upgrading from 0.x
2022-11-21 14:48:55 +00:00
Jakob Ackermann
897ad8b72a
[docs] extend docs for upgrading from 0.x 2022-11-17 13:03:29 +00:00
Jakob Ackermann
c09a0cd78a
Merge pull request #121 from overleaf/jpa-version-3-3-2
Update seed version to the latest 3.3.2 hotfix
2022-11-15 14:18:09 +00:00