diff --git a/Gemfile.lock b/Gemfile.lock index 0fc7045..55b1bc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: http://rubygems.org/ specs: - activesupport (3.2.14) + activesupport (3.2.17) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - chunky_png (1.2.8) + chunky_png (1.3.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) - compass (0.12.2) + coffee-script-source (1.7.0) + compass (0.12.4) chunky_png (~> 1.2) fssm (>= 0.2.7) - sass (~> 3.1) + sass (~> 3.2.17) compass-holmes (0.1.1) compass (>= 0.11) em-websocket (0.5.0) @@ -21,95 +21,93 @@ GEM eventmachine (1.0.3) execjs (1.4.0) multi_json (~> 1.0) - ffi (1.9.0) + ffi (1.9.3) fssm (0.2.10) - haml (4.0.3) + haml (4.0.5) tilt hike (1.2.3) http_parser.rb (0.5.3) - i18n (0.6.5) - kramdown (1.1.0) - listen (1.2.3) + i18n (0.6.9) + json (1.8.1) + kramdown (1.3.3) + listen (1.3.1) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) rb-kqueue (>= 0.2) - middleman (3.1.5) + middleman (3.2.2) coffee-script (~> 2.2.0) compass (>= 0.12.2) execjs (~> 1.4.0) haml (>= 3.1.6) - kramdown (~> 1.1.0) - middleman-core (= 3.1.5) - middleman-more (= 3.1.5) + kramdown (~> 1.2) + middleman-core (= 3.2.2) middleman-sprockets (>= 3.1.2) sass (>= 3.1.20) - uglifier (~> 2.1.0) - middleman-core (3.1.5) + uglifier (~> 2.4.0) + middleman-core (3.2.2) activesupport (~> 3.2.6) bundler (~> 1.1) - i18n (~> 0.6.1) - listen (~> 1.2.2) + i18n (~> 0.6.9) + listen (~> 1.1) rack (>= 1.4.5) rack-test (~> 0.6.1) thor (>= 0.15.2, < 2.0) - tilt (~> 1.3.6) - middleman-deploy (0.1.3) + tilt (~> 1.4.1) + middleman-deploy (0.2.3) middleman-core (>= 3.0.0) net-sftp ptools - middleman-livereload (3.1.0) - em-websocket (>= 0.2.0) - middleman-core (>= 3.0.2) - multi_json (~> 1.0) - rack-livereload - middleman-more (3.1.5) - middleman-sprockets (3.1.4) - middleman-core (>= 3.0.14) - middleman-more (>= 3.0.14) + middleman-livereload (3.2.1) + em-websocket (~> 0.5.0) + middleman-core (~> 3.2) + multi_json (~> 1.8.4) + rack-livereload (~> 0.3.15) + middleman-sprockets (3.3.1) + middleman-core (>= 3.2) sprockets (~> 2.1) sprockets-helpers (~> 1.0.0) sprockets-sass (~> 1.0.0) - multi_json (1.8.0) + multi_json (1.8.4) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (2.7.0) - oily_png (1.1.0) - chunky_png (~> 1.2.7) - ptools (1.2.2) + net-ssh (2.8.0) + oily_png (1.1.1) + chunky_png (~> 1.3.0) + ptools (1.2.4) rack (1.5.2) rack-livereload (0.3.15) rack rack-test (0.6.2) rack (>= 1.0) - rake (10.1.0) - rb-fsevent (0.9.3) - rb-inotify (0.9.2) + rake (10.2.2) + rb-fsevent (0.9.4) + rb-inotify (0.9.3) ffi (>= 0.5.0) - rb-kqueue (0.2.0) + rb-kqueue (0.2.2) ffi (>= 0.5.0) - sass (3.2.11) - slim (2.0.1) + sass (3.2.18) + slim (2.0.2) temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) - sprockets (2.10.0) + sprockets (2.12.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sprockets-helpers (1.0.1) sprockets (~> 2.0) - sprockets-sass (1.0.2) + sprockets-sass (1.0.3) sprockets (~> 2.0) tilt (~> 1.1) susy (1.0.9) compass (>= 0.12.2) sass (>= 3.2.0) temple (0.6.7) - thor (0.18.1) - tilt (1.3.7) - uglifier (2.1.2) + thor (0.19.1) + tilt (1.4.1) + uglifier (2.4.0) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) PLATFORMS ruby diff --git a/source/jabber/index.html.slim b/source/jabber/index.html.slim index 1ee8f08..9f62b7f 100644 --- a/source/jabber/index.html.slim +++ b/source/jabber/index.html.slim @@ -36,6 +36,11 @@ table.pure-table.pure-table-bordered summary="Connection information" ' (to send files) td proxy.higgsboson.tk:5000 +p + ' Don't have a jabber client? + ' Just visit our + a href="http://muc.higgsboson.tk/" browser-based chat + p ' We use certificate from a href="http://www.cacert.org/" cacert @@ -43,10 +48,12 @@ p a href="http://www.cacert.org/index.php?id=3" here ' to avoid certificate validation errors -p - ' Don't have a jabber client? - ' Just visit our - a href="http://muc.higgsboson.tk/" browser-based chat +p Install cacert on linux +p $ sudo -i +p $ mkdir -p /usr/local/share/ca-certificates/cacert.org +p $ wget https://www.cacert.org/certs/root.crt -O /usr/local/share/ca-certificates/cacert.org/cacert.org_root.crt +p $ wget http://www.cacert.org/certs/class3.crt -O /usr/local/share/ca-certificates/cacert.org/cacert.org_class3.crt +p $ update-ca-certificates #chatpanel #collective-xmpp-chat-data"