rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-20 14:54:15 +01:00
Code Issues Releases Activity

Merge branch 'dev' into master for release 4.5.8

Browse Source
This commit is contained in:
Sylvain 2020-09-28 09:55:47 +02:00
commit a5e0acaef6
4 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
# Changelog Fab-manager # Changelog Fab-manager
## v4.5.8 2020 Septembre 28
- Fix a bug: unable to run the elastic-upgrade script
- Fix a security issue: updated rails to 5.2.4.4 to fix [CVE-2020-15169](https://nvd.nist.gov/vuln/detail/CVE-2020-15169)
## v4.5.7 2020 September 23 ## v4.5.7 2020 September 23
- Fix a bug: unable to run tests suite with run-tests.sh - Fix a bug: unable to run tests suite with run-tests.sh

88
Gemfile.lock
View File

@ -22,46 +22,46 @@ GEM
Ascii85 (1.0.3) Ascii85 (1.0.3)
aasm (5.0.8) aasm (5.0.8)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
actioncable (5.2.4.3) actioncable (5.2.4.4)
actionpack (= 5.2.4.3) actionpack (= 5.2.4.4)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailer (5.2.4.3) actionmailer (5.2.4.4)
actionpack (= 5.2.4.3) actionpack (= 5.2.4.4)
actionview (= 5.2.4.3) actionview (= 5.2.4.4)
activejob (= 5.2.4.3) activejob (= 5.2.4.4)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.2.4.3) actionpack (5.2.4.4)
actionview (= 5.2.4.3) actionview (= 5.2.4.4)
activesupport (= 5.2.4.3) activesupport (= 5.2.4.4)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-page_caching (1.2.2) actionpack-page_caching (1.2.2)
actionpack (>= 5.0.0) actionpack (>= 5.0.0)
actionview (5.2.4.3) actionview (5.2.4.4)
activesupport (= 5.2.4.3) activesupport (= 5.2.4.4)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_record_query_trace (1.7) active_record_query_trace (1.7)
activejob (5.2.4.3) activejob (5.2.4.4)
activesupport (= 5.2.4.3) activesupport (= 5.2.4.4)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.2.4.3) activemodel (5.2.4.4)
activesupport (= 5.2.4.3) activesupport (= 5.2.4.4)
activerecord (5.2.4.3) activerecord (5.2.4.4)
activemodel (= 5.2.4.3) activemodel (= 5.2.4.4)
activesupport (= 5.2.4.3) activesupport (= 5.2.4.4)
arel (>= 9.0) arel (>= 9.0)
activestorage (5.2.4.3) activestorage (5.2.4.4)
actionpack (= 5.2.4.3) actionpack (= 5.2.4.4)
activerecord (= 5.2.4.3) activerecord (= 5.2.4.4)
marcel (~> 0.3.1) marcel (~> 0.3.1)
activesupport (5.2.4.3) activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -115,7 +115,7 @@ GEM
compass (~> 1.0.0) compass (~> 1.0.0)
sass-rails (< 5.1) sass-rails (< 5.1)
sprockets (< 4.0) sprockets (< 4.0)
concurrent-ruby (1.1.6) concurrent-ruby (1.1.7)
connection_pool (2.2.3) connection_pool (2.2.3)
coveralls_reborn (0.18.0) coveralls_reborn (0.18.0)
simplecov (>= 0.18.1, < 0.20.0) simplecov (>= 0.18.1, < 0.20.0)
@ -187,7 +187,7 @@ GEM
httparty (0.18.0) httparty (0.18.0)
mime-types (~> 3.0) mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
i18n (1.8.2) i18n (1.8.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
icalendar (2.5.3) icalendar (2.5.3)
ice_cube (~> 0.16) ice_cube (~> 0.16)
@ -222,7 +222,7 @@ GEM
listen (3.0.8) listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.5.0) loofah (2.7.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
@ -239,7 +239,7 @@ GEM
mini_magick (4.10.1) mini_magick (4.10.1)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
minitest (5.14.1) minitest (5.14.2)
minitest-reporters (1.4.2) minitest-reporters (1.4.2)
ansi ansi
builder builder
@ -249,8 +249,8 @@ GEM
multi_json (1.14.1) multi_json (1.14.1)
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.1.1) multipart-post (2.1.1)
nio4r (2.5.2) nio4r (2.5.4)
nokogiri (1.10.9) nokogiri (1.10.10)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
notify_with (0.0.2) notify_with (0.0.2)
jbuilder (~> 2.0) jbuilder (~> 2.0)
@ -306,18 +306,18 @@ GEM
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
railroady (1.5.3) railroady (1.5.3)
rails (5.2.4.3) rails (5.2.4.4)
actioncable (= 5.2.4.3) actioncable (= 5.2.4.4)
actionmailer (= 5.2.4.3) actionmailer (= 5.2.4.4)
actionpack (= 5.2.4.3) actionpack (= 5.2.4.4)
actionview (= 5.2.4.3) actionview (= 5.2.4.4)
activejob (= 5.2.4.3) activejob (= 5.2.4.4)
activemodel (= 5.2.4.3) activemodel (= 5.2.4.4)
activerecord (= 5.2.4.3) activerecord (= 5.2.4.4)
activestorage (= 5.2.4.3) activestorage (= 5.2.4.4)
activesupport (= 5.2.4.3) activesupport (= 5.2.4.4)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 5.2.4.3) railties (= 5.2.4.4)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
@ -331,9 +331,9 @@ GEM
rails_stdout_logging rails_stdout_logging
rails_serve_static_assets (0.0.5) rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5) rails_stdout_logging (0.0.5)
railties (5.2.4.3) railties (5.2.4.4)
actionpack (= 5.2.4.3) actionpack (= 5.2.4.4)
activesupport (= 5.2.4.3) activesupport (= 5.2.4.4)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0) thor (>= 0.19.0, < 2.0)
@ -406,7 +406,7 @@ GEM
sprockets (3.7.2) sprockets (3.7.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.1) sprockets-rails (3.2.2)
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
@ -448,7 +448,7 @@ GEM
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0) hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.2) websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fab-manager", "name": "fab-manager",
"version": "4.5.7", "version": "4.5.8",
"description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
"keywords": [ "keywords": [
"fablab", "fablab",

10
scripts/elastic-upgrade.sh
View File

@ -337,10 +337,10 @@ upgrade_compose()
abs_dir=$(echo "$dir" | sed "s^\${PWD}^$FM_PATH^") abs_dir=$(echo "$dir" | sed "s^\${PWD}^$FM_PATH^")
echo -e "\nCopying ElasticSearch 2.4 configuration files from GitHub to $abs_dir..." echo -e "\nCopying ElasticSearch 2.4 configuration files from GitHub to $abs_dir..."
mkdir -p "$abs_dir" mkdir -p "$abs_dir"
curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/elasticsearch.yml > "$abs_dir/elasticsearch.yml" curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/elasticsearch.yml > "$abs_dir/elasticsearch.yml"
curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/log4j2.properties > "$abs_dir/log4j2.properties" curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/log4j2.properties > "$abs_dir/log4j2.properties"
fi fi
docker-compose pull docker-compose pull elasticsearch
docker-compose up -d docker-compose up -d
wait_for_online wait_for_online
wait_for_green_status wait_for_green_status
@ -387,8 +387,8 @@ upgrade_docker()
then then
configdir=$(echo "$volumes" | grep config | awk -F'[ :]' '{print $2}') configdir=$(echo "$volumes" | grep config | awk -F'[ :]' '{print $2}')
echo -e "\nCopying ElasticSearch 2.4 configuration files from $(pwd)/docker to $configdir..." echo -e "\nCopying ElasticSearch 2.4 configuration files from $(pwd)/docker to $configdir..."
sudo cp docker/elasticsearch.yml "$configdir" sudo cp setup/elasticsearch.yml "$configdir"
sudo cp docker/log4j2.properties "$configdir" sudo cp setup/log4j2.properties "$configdir"
fi fi
docker pull "$image" docker pull "$image"
echo docker run --restart=always -d --name="$name" --network="$network" --ip="$ES_IP" "$mounts" "$ports" "$image_name" | bash echo docker run --restart=always -d --name="$name" --network="$network" --ip="$ES_IP" "$mounts" "$ports" "$image_name" | bash