Jakob Ackermann
38c387da19
Merge remote-tracking branch 'origin/jpa-relaunch-bin-upgrade' into jpa-msm-overleaf-rc-rebrand
...
# Conflicts:
# bin/upgrade
2024-02-26 17:09:24 +00:00
Jakob Ackermann
aa77274c19
Cleanup bin/doctor lookup for ShareLaTeX branded overleaf.rc
2024-02-26 16:53:41 +00:00
Jakob Ackermann
86ef323f70
Check on variable rebranding from bin/doctor
2024-02-26 16:50:21 +00:00
Jakob Ackermann
060d7a896b
Print number of mismatching variables in overleaf.rc
2024-02-26 16:47:53 +00:00
Jakob Ackermann
ce650bd49a
Print expected prefix when checking variables.env
2024-02-26 16:45:59 +00:00
Jakob Ackermann
dcc19a781e
Refuse to start with mismatching ShareLaTeX vs Overleaf branded configs
2024-02-26 13:03:18 +00:00
Jakob Ackermann
7d2496e2eb
Move prompt for rebranding into helper function
2024-02-26 12:36:29 +00:00
Jakob Ackermann
be3b10a182
Handle overleaf.rc rebranding before version upgrade
2024-02-26 12:33:16 +00:00
Jakob Ackermann
e2cbe387e0
Relaunch bin/upgrade after pulling changes via git
2024-02-26 11:53:08 +00:00
Miguel Serrano
b9bc72b5a8
Merge branch 'master' into msm-overleaf-rc-rebrand
2024-02-19 10:31:31 +01:00
mserranom
0dd9750a58
Use separate legacy compose files for required SHARELATEX_ vars
2024-02-19 10:29:55 +01:00
mserranom
f1a50d986e
Move set +o pipefail into subshell commands
2024-02-16 13:51:43 +01:00
Miguel Serrano
6314f36e3f
Merge pull request #206 from Nekoyue/upgrade-warning
...
Warning when running bin/upgrade with custom docker image
2024-02-15 14:54:40 +01:00
mserranom
eeb9ae3d82
Moved prefix brand checs from bin/up to bin/docker-compose
2024-02-15 12:13:59 +01:00
mserranom
0fee1a6f7d
Remove unnecessary fallbacks to SHARELATEX_ vars
2024-02-15 12:05:10 +01:00
Kagurazaka Tsuki
b058321ed9
slience grep output
...
add -q argument
Co-authored-by: Jakob Ackermann <das7pad@outlook.com>
2024-02-14 12:10:18 -06:00
Miguel Serrano
b9d2c5594b
Fix doctor logs
...
Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
2024-02-14 16:10:19 +01:00
Miguel Serrano
1667e02b52
Fix script documentation
...
Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
2024-02-14 16:10:19 +01:00
mserranom
17ff23c1f6
Update bin/doctor to support OVERLEAF_ prefix
2024-02-14 16:09:31 +01:00
mserranom
1cb92d9f48
Rebrand variables for bin/docker-compose
...
Updates docker-compose.base.yml and sibling containers
base file with the changes in the script
2024-02-14 16:09:31 +01:00
mserranom
8fae76992e
Update bin/up to check for correct variable prefix
...
Ensures SHARELATEX_ is in place for version <= 4.x, and
OVERLEAF_ for version >= 5.x
2024-02-14 16:09:31 +01:00
mserranom
1446e54590
Update bin/upgrade to prompt for config file rebrand
2024-02-14 16:09:31 +01:00
mserranom
cfe060b4f4
Add scripts to rebrand variables.env and overleaf.rc
2024-02-14 16:09:31 +01:00
Miguel Serrano
d34edf386a
Scripts to rebrand variables.env ( #214 )
...
* Scripts to rebrand environment variables
* Add missing EOF
* Removed leftover
Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
* Fixed comment
Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
* add timestamp to backup file
* renamed script
* extracted replace logic to shared function
* preventing variables.env to backup when not needed
---------
Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
2024-02-14 10:08:04 +01:00
Kagurazaka Tsuki
ab051e8f11
warning in bin/upgrade if user changes image in docker-compose.override.yml
2023-11-28 14:11:57 -06:00
Jakob Ackermann
f271787d3f
Add full project history services to bin scripts
2023-10-24 12:31:27 +01:00
Jakob Ackermann
2ec1e682a1
Use web-api for git-bridge in Server Pro 4.2.0 onwards
2023-09-18 12:39:41 +01:00
Miguel Serrano
0094dacf2c
Configurable 'GIT_BRIDGE_IMAGE' and 'GIT_BRIDGE_LOG_LEVEL'
2023-06-15 10:06:46 +02:00
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
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
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
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
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
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
5971ffc5d4
Check Server Pro version before starting git bridge
2023-04-03 15:38:02 -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
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
Jakob Ackermann
49460cbfec
[bin/doctor] flag incomplete S3 config
2023-02-28 14:27:24 +00:00
Miguel Serrano
e39aa84e7f
Improve messaging on upgrade scripts
...
Clears some ambiguity about whether "proceed" means doing a backup or actually upgrading SP.
2022-09-22 12:13:39 +02:00
Miguel Serrano
fb4fb75dac
Fix unbound variable error ( #107 )
...
`SHARELATEX_LISTEN_IP ` might be not defined in old configs, so we skip
temporarily the check of unset variables with `set +u`
2022-08-31 11:10:37 +02:00
Miguel Serrano
46ad6309c9
Add docs and default config for SHARELATEX_LISTEN_IP ( #105 )
...
* Add docs and default config for SHARELATEX_LISTEN_IP
* empty value considered not set for `SHARELATEX_LISTEN_IP `
Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
* updated changelog and fixed dates for previous entries
Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
2022-08-16 11:33:58 +02:00
Miguel Serrano
be13a095a1
prompt warning on major version upgrades
2021-12-20 16:08:43 +01:00
Christopher Hoskin
8b39c8af71
Add new variables to the doctor
2021-10-12 10:12:36 +01:00
Christopher Hoskin
2be24268de
Configure nginx to redirect HTTP to HTTPS
2021-10-07 10:04:15 +01:00
Miguel Serrano
e8d6582f64
Prevent unbound var error with NGINX_ENABLED ( #62 )
...
* prevents unbound var error with NGINX_ENABLED
* Fixed name of config file
2021-07-12 17:12:45 +02:00
