From 24fcfb3b26fd263d4c21be93700c49434b9ef0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Verstraeten?= Date: Fri, 30 Mar 2018 13:49:53 +0200 Subject: [PATCH 1/4] fixes #111 configuration doesn't work This fix will make sure the settings are persisted. --- app/Http/Controllers/UserController.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index a8f6ffc..90df1c3 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -9,7 +9,13 @@ class UserController extends BaseController { public function __construct() { - $this->kerberos = Config::get("kerberos"); + $this->kerberos = Session::get('kerberos', []); + if(count($this->kerberos) == 0) + { + $this->kerberos = Config::get("kerberos"); + Session::put('kerberos', $this->kerberos); + } + $this->fileLoader = new FileLoader(new Filesystem(), config_path()); } @@ -58,10 +64,9 @@ public function install() } $this->fileLoader->save($config, '', 'kerberos'); + Session::put('kerberos', $config); - $newConfig = Config::get("kerberos"); - - if($newConfig['installed']) + if($config['installed']) { $config["error"] = false; return Response::json($config); From 0b12c632e953e74fc690f1a452b9bfe36150f6ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Verstraeten?= Date: Fri, 30 Mar 2018 15:17:13 +0200 Subject: [PATCH 2/4] upgrade node --- docker/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 770ebb3..24a21f7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,13 +26,15 @@ RUN ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/defau ##################### # Clone and build web +RUN curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash - && apt-get install -y nodejs + RUN git clone https://github.com/kerberos-io/web /var/www/web && cd /var/www/web && git checkout ${APP_ENV} && \ chown -Rf www-data.www-data /var/www/web && curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer && \ cd /var/www/web && \ composer install --prefer-source && \ npm install -g bower && \ cd public && \ -nodejs /usr/local/bin/bower --allow-root install +nodejs /usr/lib/node_modules/bower/bin/bower --allow-root install RUN rm /var/www/web/public/capture && \ ln -s /etc/opt/kerberosio/capture/ /var/www/web/public/capture From 89603ba66182dc55df2238ee2d62f4f577241af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Verstraeten?= Date: Fri, 30 Mar 2018 20:33:00 +0200 Subject: [PATCH 3/4] fix dependencies --- public/bower.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/bower.json b/public/bower.json index 514a3b4..64a5aee 100755 --- a/public/bower.json +++ b/public/bower.json @@ -32,15 +32,15 @@ "seiyria-bootstrap-slider": "5.3.3", "csshake": "*", "chartjs": "1.0.2", - "mjpegcanvas": "~0.4.0", - "mustache": "~0.7.0", - "fontawesome": "~4.7.0", - "css-toggle-switch": "~4.0.2", + "mjpegcanvas": "0.4.0", + "mustache": "0.7.0", + "fontawesome": "4.7.0", + "css-toggle-switch": "4.0.2", "remodal": "0.6.4", "progressbar.js": "~1.0.0", - "photoswipe": "~4.1.1", + "photoswipe": "4.1.1", "video.js": "5.17.0", - "videojs-playlist": "^3.0.0", + "videojs-playlist": "3.0.0", "owl.carousel": "2.2.0" } } From 532e01490c98ca705cffd4df487d3aaaf6141279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Verstraeten?= Date: Fri, 30 Mar 2018 20:33:55 +0200 Subject: [PATCH 4/4] upgrade --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index 9ea1166..d01334d 100644 --- a/config/app.php +++ b/config/app.php @@ -13,7 +13,7 @@ | */ - 'version' => '2.5.0', + 'version' => '2.5.1', 'config' => '/etc/opt/kerberosio/config',