muxator
9d35d15ae3
node8: require nodejs >= 8.9.0, npm >= 6.4
...
Next version will be Etherpad 1.8. As planned in #3424 , we are going to require
NodeJS >=8.9.0 and npm >= 6.4.
This commit implements that change and updates documentation and scripts.
Subsequent changes will get rid of old idioms, dating back to node < 0.7, that
still survive in the code.
Once migrated to NodeJS 8, we will be able to start working on migrating the
code base from callbacks to async/await, greatly simplifying legibility (see
#3540 ).
Closes #3557
2019-02-19 22:01:12 +01:00
muxator
acc0b05702
windows: 1.7.5 was released with node 8.15.0. Document it here.
2019-01-27 13:48:24 +01:00
Joseph C Wang
ae49409593
fix for python3
2019-01-22 22:23:18 +01:00
HairyFotr
fce55df2b7
Fix typos
2019-01-16 11:14:04 +01:00
Luiza Pagliari
59cae81152
[chore] Allow debug mode on node versions >= 6.3 ( #3527 )
...
I've tried to install `node-inspector` using Node 8 and it looks like it is not supported.
According to the [documentation of that tool](https://www.npmjs.com/package/node-inspector ):
> Since version 6.3, Node.js provides a built-in DevTools-based debugger which mostly deprecates Node Inspector (...). The built-in debugger (...) provides certain advanced features (...) that are too difficult to implement in Node Inspector.
As [we require nodejs >= 6.9.0](https://github.com/ether/etherpad-lite#requirements ), and as [`node-inspector` only works on Chrome and Opera](https://www.npmjs.com/package/node-inspector#debug ), it looks like a good approach to remove the dependency of that tool and use Chrome DevTools directly. Besides, [there are other tools available](https://nodejs.org/en/docs/guides/debugging-getting-started/#inspector-clients ) for debugging, if Chrome is not an option.
This PR also allow external connections to the inspector, so Etherpad instances running on containers can also be debugged. [There are obviously some risks to leave that opened on public IPs](https://nodejs.org/en/docs/guides/debugging-getting-started/#exposing-the-debug-port-publicly-is-unsafe ), but I assumed no instance would run on debug mode for the final user.
2018-12-22 10:28:50 -02:00
Stefan More
799319882c
migrateDirtyDBtoRealDB: disabled write buffer, #2214
2018-11-27 21:18:40 +01:00
Stefan More
b8fa179622
migrateDirtyDBtoRealDB: added hint regarding memory, #2214
2018-11-27 21:18:40 +01:00
Achim Friedland
5f836f6211
Try/catch to skip invalid JSON in dirtyDB
2018-11-03 00:12:08 +01:00
muxator
9aaa02ec70
installDeps: no need to download jquery at starting time. Remove curl dependency
...
In installDeps.sh we have a bunch of code (from 2011) that checks for the
existence of jQuery and eventually downloads it, but since 1239ce7f28
(year
2012) jquery is vendorized in /src/static/js/jquery.js.
Also, stop mentioning curl as a dependency in the README.md
Fixes #3494
2018-10-07 18:56:28 +02:00
muxator
c09e638fc3
installDeps.sh: don't nuke all installed plugins on update
...
This is a modification of PR #3474 by rohieb <rohieb@rohieb.name>.
When this script is run after an update, and something fails during the npm
run, the installed plugins were deleted, too.
In this version what gets deleted is only the directory that contains the
direct dependencies of the core Etherpad, ie:
node_modules/ep_etherpad-lite/node_modules
2018-08-29 21:45:33 +02:00
muxator
0c518cadf5
skins: replace {js,css}.template with actual files. Simplify startup scripts.
...
Currently, an Etherpad skin requires the existence of 6 files:
- index.{css,js}
- pad.{css,js}
- timeslider.{css,js}
In the default empty skin (in static/custom), there were 2 small placeholders
({js,css}.template) to be copied in place by the startup script in case no skin
was in use.
Now that we are moving to multiple directories (see #3471 ) we can simply commit
the example files and remove the copying code from the startup script.
2018-08-26 21:17:04 +02:00
muxator
5f9de6948c
cleanRun.sh: get rid of "Bad substitution" error
...
It was introduced in 4a18f0d97d
(#3356 ).
2018-08-17 22:22:14 +02:00
muxator
d7696413da
createRelease.sh: deprecate the script. It will be removed or modified.
...
Starting with Etherpad 1.7.0, the branching strategies for releases will be
simplified.
Leaving this script here, as it's useful for documenting other release-related
activities.
2018-08-17 00:09:25 +02:00
"muxator ext:(%22)
d23cf924c9
installDeps: replace GNU specific long options whith short ones
...
Long options are only present in GNU cut, and we aim to also support other
platforms.
2018-07-31 12:44:17 +02:00
muxator
379690abbf
tests: backend tests are now run with "npm test" instead of a custom bash script
2018-07-28 23:54:51 +02:00
muxator
a3ae374a67
installDeps: made version detection more robust. Require Node >= 6.9, npm >= 3.10
...
require_minimal_version() tries to parse semvers in a Posix portable way and
ensure a minimal Major.minor version is met.
2018-07-28 23:33:24 +02:00
muxator
c4918efc1b
installDeps.sh: do not modify package.json when installing dependencies
...
installDeps.sh's only side effect should be to actually install dependencies
according to a configuration file, and not to modify it.
Adding --no-save to the npm command line forces npm to have a read only access
to package.json.
Old npm versions seem to support --no-XXX style flags even if not documented
(see https://github.com/npm/npm/issues/14285#issuecomment-254298519 )
Tested with npm 3.5.2 and 6.1.0
Fixes #3396
2018-07-14 17:54:26 +02:00
muxator
6dbeca217e
createRelease.sh: changelog editing failed for multiline messages
...
sed does not accept multiline strings in its replacement text.
Let's replace newlines with literal "\n" in modify_files()
2018-05-04 00:36:09 +02:00
muxator
903a2c8e43
createRelease.sh: added error checking in modify_files()
...
Otherwise, when inserting a multiline changelog sed would with this message:
sed: -e expression #1 , char 27: unterminated `s' command
And the script would continue with an unmodified CHANGELOG.md
For simmetry, added the same check to package.json, too
2018-05-03 23:54:08 +02:00
John McLear
0c8b9e13fa
Merge pull request #3242 from BenaeSan/master
...
FIX the installOnWindows Error
2018-04-03 13:06:30 +01:00
John McLear
ad89cb7d78
Merge pull request #3331 from sevu/pythonv2
...
specify python version in shebang
2018-04-03 13:00:45 +01:00
John McLear
e6e46404d1
Merge pull request #3342 from caugner/patch-1
...
Add checkPad variant to check all pads/revisions
2018-04-03 12:58:23 +01:00
Bryce York
4a18f0d97d
Fix bug with cleanRun.sh
...
Now works if the output of `pwd` has a space in it.
2018-03-28 22:38:30 +11:00
Claas Augner
5c915062e1
checkAllPads: Increase performance/resilience
...
Performance: Don't preload pads. Check for pool only once per pad.
Resilience: Handle missing revision.
2018-03-09 14:02:22 +01:00
Claas Augner
5c864ec47d
Add checkPad variant to check all pads/revisions
2018-03-09 13:45:24 +01:00
Severin Glöckner
0139965864
specify python version
2018-03-01 07:57:46 +01:00
John McLear
ad09e8ed76
Update package.json
2017-11-20 08:46:24 +00:00
Stefan (Gared)
e347f12c71
Updated node version for windows to 8.9.0
2017-11-04 17:02:25 +01:00
HairyFotr
c7548450c0
Typos and minor fixes in bin, doc, and root
2017-09-14 13:33:27 +02:00
bm jade
64aee56940
FIX
...
missing backslashes
2017-08-07 17:15:02 +02:00
bm jade
193afacb6f
FIX
...
fix provide by skupfer from github, It fix the installOnWindows problem
2017-08-07 16:36:44 +02:00
jeffreyye
9ca56a4c7e
wrong path of generate.js
2017-04-04 15:13:07 +08:00
Stefan
8992dd665a
Merge new release into master branch!
2016-12-23 22:00:34 +01:00
Stefan
6dc808ad54
Release version 1.6.1
2016-12-23 21:59:57 +01:00
Stefan
caabb4d8f7
Update nodejs for windows to 6.9.2
2016-12-22 23:15:49 +01:00
Stefan
d1d2e462d0
Updated node for windows build to version 6.9.1
2016-11-20 12:32:36 +01:00
rugk
f4bbe00322
Download JQuery over HTTPS
...
Otherwise anyone can MITM the connection and add rogue code there.
2016-07-23 16:59:47 +02:00
Stefan
e11decc6f8
Fix module paths for db migration script
2016-06-08 19:43:53 +02:00
Stefan
1349cfd486
Fix error if whitespace in etherpad path
2016-05-16 16:58:58 +02:00
Stefan
fb96f32028
Update node for windows to version 4.4.3
2016-04-24 20:42:53 +02:00
Stefan
8aa297fb40
Remove node version output on start
2016-04-24 20:29:07 +02:00
Stefan
7637b0cd19
Increase version of node for windows to 4.4.2
2016-04-03 16:57:15 +02:00
John McLear
e1999d826c
allow greater than or equal to v 4
2016-03-27 13:31:00 +08:00
John McLear
75cd4b3333
Merge pull request #2924 from Gared/update_windows_build
...
Update windows build
2016-03-26 22:11:40 +08:00
Stefan
2a81d2a578
Remove support for io.js
2016-03-20 15:21:56 +01:00
Stefan
18d583d92d
Check for node version 4 or higher and not special versions
2016-03-20 15:19:34 +01:00
Stefan
3738211fd8
Do not include absolute path in windows zip
2016-03-20 14:13:26 +01:00
Stefan
bd2372def1
Update windows build:
...
- Update node to version 4.4.0
- Create temp folder dynamically
2016-03-14 21:56:04 +01:00
Reed A. Cartwright
843b05a6ec
Use exec to switch to node process
...
At the end of run, `exec` should be used to switch to the node process. That way node will take over the pid of `sh run.sh`, making it easier to monitor and daemonize the server.
```
exec [command [arg ...]]
Unless command is omitted, the shell process is replaced with the
specified program (which must be a real program, not a shell
built-in command or function). Any redirections on the exec com-
mand are marked as permanent, so that they are not undone when
the exec command finishes.
```
2016-01-19 16:17:16 -07:00
Blake Tölva
c61aa20028
Improve DB migration performance.
...
Achieve 10x speedup in migrating a 12mb dirtyDB file by disabling
ueberDB caching in this special case. Add some progress messages
to the migration script and rename it, as nothing in it is tied
to mysql.
2015-11-21 23:15:46 -08:00
Komasa
5f9d1397e2
Update installDeps.sh
2015-11-04 21:15:13 +01:00
John McLear
02f88aafff
Update installOnWindows.bat
2015-10-22 16:22:35 +01:00
John McLear
fa46f0b613
Merge pull request #2797 from ypid/rebuild-better-error
...
Give better error message when rebuildPad.js hits a non-existing rev.
2015-10-22 16:15:27 +01:00
Robin Schneider
c9924ee706
Give better error message when rebuildPad.js hits a non-existing rev.
2015-10-07 12:42:19 +02:00
Stefan
bf7930fccb
Support version 4 of node.js
2015-09-26 12:15:54 +02:00
István Király
376fccfe92
bugfix for correct bash syntax
...
$rocks has to be enclosed into a "string" so bash can treat is as a string.
We can compare two strings with the == operator then, ...
2015-06-22 16:11:29 +02:00
Hinnerk Haardt
7ba5e97a60
Use current mysql client API
2015-05-30 15:14:40 +02:00
John McLear
e1406b826b
cleaner update logic doesnt error when nothing to do
2015-04-26 14:42:21 +01:00
John McLear
a6a8c4d909
provide a script that cleans up before running to save people doing rm rf src node_modules
2015-04-24 07:07:18 +01:00
John McLear
70d338c7d5
Merge pull request #2618 from Gared/win_node_version
...
Update node version for windows build to 0.12.2
2015-04-16 21:58:13 +01:00
Stefan
f81c6b6476
Update node version for windows build to 0.12.2
2015-04-16 22:56:14 +02:00
John McLear
a3ce6b1ca7
remove two pointless dep removes
2015-04-15 15:51:13 +01:00
Tom Hunkapiller
4385598de6
update node version checking to 0.10+ or io.js
2015-04-08 23:12:12 -05:00
Tom Hunkapiller
63cbab484d
express dropped support for node 0.8; update engine requirements
2015-04-08 23:12:11 -05:00
Raphaël Dubigny
119fc82387
Update installDeps.sh
2015-04-04 17:30:41 +02:00
Raphaël Dubigny
dfd17d1aba
Update installDeps.sh
2015-04-04 17:14:59 +02:00
LeoVerto
7e9bc1b7b9
Fix minor typo in safeRun.sh email report
2015-03-31 18:33:47 +02:00
Stefan
0505a47356
Support node version 0.12.x
2015-02-15 22:21:41 +01:00
John McLear
f880b0feb7
clean up iojs
2015-01-21 12:18:38 +00:00
nemetz
648ebc08d6
check for io.js
...
Added a check for io.js
2015-01-16 11:11:34 -02:00
Jan-Erik Rediger
1f558dc843
Removed useless use of cat
2015-01-08 14:16:07 +01:00
John McLear
80fa2c2868
move docs
2014-12-24 02:45:21 +00:00
John McLear
1ab7dfdb7b
Merge pull request #2358 from BjarniRunar/develop
...
Created dirty-db-cleaner.py - prunes old history from dirty.db files
2014-12-23 15:50:59 +00:00
John McLear
ffdce760d5
remove unused long paths from windows build
2014-12-21 22:05:07 +00:00
John McLear
89adbb9f12
Merge pull request #2329 from timrchavez/rebuild-pad-script
...
Restore pad to new location at a given revision
2014-12-04 02:34:21 +00:00
Timothy Chavez
c7b1aebfe8
Make changes based on code review
...
Simplified the cloning process, added validation checks to ensure the
new pad ID is valid and that a pad doesn't already exist with that ID.
Also fixed a bug in the chatHead cloning loop and added the ability to
specify a pad ID on the command the line (defaulting to the original
"-rebuilt" pad ID formula)
2014-12-03 20:11:39 -06:00
Bjarni R. Einarsson
9c174023fc
Added dirty-db-cleaner.py
2014-12-01 22:39:42 +00:00
John McLear
c6d7ed114e
script to update all plugins with one command on CLI
2014-11-28 16:27:12 +00:00
John McLear
5434d2118d
tidy up and re-organize
2014-11-26 19:28:49 +00:00
John McLear
88b3d99fbd
Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests
2014-11-26 15:33:13 +00:00
John McLear
0a84379364
make additional line break at end of imported doc
2014-11-26 15:19:22 +00:00
John McLear
3ac833d455
basic test runner
2014-11-25 22:47:22 +00:00
John McLear
97068b562d
more old load testing cruft
2014-11-25 01:22:32 +00:00
John McLear
5e843a5877
remove jshint
2014-11-25 01:21:19 +00:00
Timothy Chavez
25ccb6cfc3
Simplify the rebuild process
...
The majority of the information needed to build the new pad can be
communicated by simply cloning the rev using a db.set().
2014-11-20 22:09:21 -06:00
Timothy Chavez
01f6d85371
Restore pad to new location at a given revision
...
This script gives an admin with shell access the ability to restore a
pad at a given revision by essentially rebuilding it at a new location
with data associated with the original pad. The upsides to creating a
new pad vs. changing the original are: 1) avoiding service disruptions
(no deletes, no moving targets - builds from previous revision); and 2)
preservation of data (no deletes, no overwriting of the source pad).
The most obvious downside is the pad has a new ID which could require
folks to update their links, bookmarks, etc. to point at the new
location.
2014-11-19 13:09:37 -06:00
Stefan
94968e69be
Add support for npm 2
2014-09-27 12:30:11 +02:00
Gared
ab607d3137
Add a script to reinsert all db values of a pad
2014-05-19 18:18:01 +02:00
Luc Didry
3d8452b143
Replace tabs indentation with spaces indentation
...
Some files are obviously external libraries, I didn't touch them
2013-12-05 08:41:29 +01:00
John McLear
8c1e066a02
mkdir
2013-11-24 13:13:29 +00:00
John McLear
97f5b581b0
cp readme on build
2013-11-24 13:08:26 +00:00
John McLear
1eef5278bd
growwlll
2013-11-24 12:51:50 +00:00
John McLear
6ee57746c9
whoopsi
2013-11-24 12:44:09 +00:00
John McLear
d6f1aa3236
clean
2013-11-24 12:41:12 +00:00
John McLear
678c80d1dc
whoa there, no need to include .git folder in build
2013-11-24 02:57:15 +00:00
John McLear
09429be4c9
whoops
2013-11-24 02:52:55 +00:00
John McLear
61df1facd2
semi-working build script for deb packages
2013-11-24 02:42:50 +00:00
John McLear
1f68f07083
support node 0.11
2013-11-14 22:46:58 +00:00
John McLear
fa4ebd602c
Update installDeps.sh
2013-11-12 09:58:22 +00:00
John McLear
932c9ae406
allow nix file process path to be visible in ps aux
2013-11-10 16:32:33 +00:00
Eric Schrijver
b34224559d
‘Etherpad Lite’ -> ‘Etherpad’
2013-09-29 13:57:37 +02:00
Michael Parks
f3987007b0
Back to sh, fix comparison for POSIX/dash (++ CentOS, Ubuntu compatibility)
2013-09-17 15:27:52 -06:00
Michael Parks
dc2418e532
Start script needs bash instead of sh for root arguments
2013-08-15 11:06:48 -06:00
Chia-liang Kao
67b513216a
Fix safeRun that tries to shift on subsequent restarts
2013-05-29 10:40:30 +08:00
Jens Herrmann
cbbf9a82ac
Pass arguments from safeRun.sh to run.sh
2013-05-26 23:06:15 +02:00
Marcel Klehr
782c512e93
Drop support for node v0.6, officially
2013-04-01 14:07:38 +02:00
John McLear
e050ad57e4
fix typo
2013-03-22 17:39:22 +00:00
Marcel Klehr
5a9393d5da
Update version checks
2013-03-16 09:46:35 +01:00
CeBe
62c13b4c3f
typo
2013-03-07 14:10:54 +01:00
CeBe
70c329957d
additional ouput for importSqlFile
2013-03-07 14:05:55 +01:00
CeBe
4026ba1815
fixed saved data to be escaped properly
2013-03-07 13:15:29 +01:00
CeBe
f2b173f566
improved output for importSqlFile
2013-03-06 22:38:18 +01:00
CeBe
76fbc29607
improved output for importSqlFile
2013-03-06 22:36:00 +01:00
CeBe
4b7238c2cd
improved output for importSqlFile
2013-03-06 22:28:00 +01:00
CeBe
db0d0d1f72
fixed problem with npm
2013-03-06 22:08:14 +01:00
CeBe
6dfc5f2c88
a script that allows importing old etherpad db
...
this script allows you to import the sql file generated with
convert.js into all supported dbms, not only MySQL
2013-03-06 21:24:19 +01:00
Marcel Klehr
af25606ea8
Fix bin/extractPadData on windows
2013-02-27 16:26:22 +01:00
John McLear
ea4307ae97
remove console error
2013-02-26 16:32:34 -08:00
John McLear
1fd99bfd43
fix deletePad script by remembering not to miss a callback..
2013-02-26 16:32:09 -08:00
John McLear
b7d96b1dcf
a cli tool for deleting pads
2013-02-26 11:44:22 +00:00
John McLear
0a19589509
fix path for windows
2013-02-18 20:40:34 +00:00
John McLear
19964498f3
no need to parse already parsed json
2013-02-18 20:38:32 +00:00
John McLear
f76cfad42b
remove cruft
2013-02-18 08:30:42 -08:00
John McLear
4cfac2f624
fix extract and checkPad
2013-02-18 08:29:25 -08:00
John McLear
bf6958ad57
Update bin/loadTesting/README
2013-02-12 15:04:06 +00:00
John McLear
6aeed1268e
change message
2013-02-10 15:19:28 +00:00
John McLear
3a73aa2f48
please wait msg
2013-02-10 03:17:04 +00:00
Manuel Knitza
98a9b1e222
update jquery 1.7.1 -> 1.9.1
2013-02-10 02:55:50 +01:00
Manuel Knitza
7066ed183d
Update bin/convert.js
...
'lil typo
2013-01-22 00:56:39 +01:00
Marcel Klehr
90ca3d53c3
Fix #1367 : async.series was lacking callback in checkPad.js
2013-01-17 17:31:56 +01:00
mluto
7db6448e2a
Load npm before everything else in checkPad.js
2013-01-15 07:31:51 +01:00
John McLear
025c92f346
Merge pull request #1328 from mluto/run-sh-root-argument
...
Added --root argument to run.sh to bypass the root-check, fix for #1324
2013-01-14 08:14:13 -08:00
Marcel Klehr
f4b95c5ca4
Add log4js config setting
2013-01-13 12:20:49 +01:00
mluto
e7d9359737
Added error-handling for npm
2013-01-06 20:20:46 +01:00
mluto
7ec7ccc402
Fixed extractPadData.js, #1320
2013-01-06 19:25:32 +01:00
mluto
6a27a54727
Added --root argument to run.sh to bypass the root-check, fix for #1324
2013-01-06 12:48:32 +01:00
Hyacinthe Cartiaux
d6027726e6
Fix urls, use github.com/ether
...
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
2012-11-22 01:12:30 +01:00
Marcel Klehr
b515156041
Only show errors/warnings on npm install [windows]
2012-11-19 15:24:48 +01:00
Marcel Klehr
3e53a11127
Show errors on npm install
2012-11-19 15:19:59 +01:00
johnyma22
cefbd8354d
fix tiny error of missing space
2012-11-16 21:12:04 +00:00
johnyma22
fbe16da728
dont forget to allow for cleanup
2012-11-16 20:52:19 +00:00
johnyma22
27c5e8691f
mheh, better way of handling the buidl for windows script
2012-11-16 20:51:08 +00:00
johnyma22
1321d9e16f
Resolve #1171 by not including tests in windows build
2012-11-16 20:17:25 +00:00
John McLear
bad9b2ee66
Merge pull request #1162 from ether/windows-build-script-exclusions
...
Dont include git history in the windows .zip
2012-11-15 08:10:30 -08:00
Marcel Klehr
fcee203a1a
Dont include git history in the windows .zip
...
git history is located in .git/objects
2012-11-15 15:16:12 +01:00
John McLear
3821c1441c
Merge pull request #1150 from marcelklehr/fix/script-migrate-dirty-mysql
...
Fix #1142 error in bin/migrateDirtyDBtoMySQL.js
2012-11-14 10:40:11 -08:00
Peter 'Pita' Martischka
4c095202bd
Merged branch feature/frontend-tests
2012-11-13 07:29:57 -08:00
Marcel Klehr
b057759eae
Fix #1142 error in bin/migrateDirtyDBtoMySQL.js
...
npm must be npm.load'ed before using it
2012-11-09 22:06:26 +01:00
Bastian
05f96429ef
added solaris compatibility: removed -v flag from cp, witch is not known by solaris cp // added condition for gnu-grep (ggrep), solaris grep has no -o flag
2012-11-07 12:51:51 +01:00
Peter 'Pita' Martischka
c8dfa6d7ae
less noise
2012-11-01 23:46:04 +00:00