diff --git a/changelog.md b/changelog.md
index fdd53ca46..ae5e2cc4f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,7 @@
-[v0.57.7](https://github.com/nextcloud/nextcloudpi/commit/619812c) (2018-06-19) docker: fix persist ncp-web password
+[v0.57.8](https://github.com/nextcloud/nextcloudpi/commit/61360da) (2018-06-19) docker: adapt wizard
+
+[v0.57.7](https://github.com/nextcloud/nextcloudpi/commit/98c99e3) (2018-06-19) docker: fix persist ncp-web password
[v0.57.6 ](https://github.com/nextcloud/nextcloudpi/commit/9d0d3b3) (2018-06-19) fix mysqld service named mysql
diff --git a/docker-armhf/nextcloudpi/Dockerfile b/docker-armhf/nextcloudpi/Dockerfile
index f6176074a..569a9d57d 100644
--- a/docker-armhf/nextcloudpi/Dockerfile
+++ b/docker-armhf/nextcloudpi/Dockerfile
@@ -32,9 +32,6 @@ sed -i 's|/media/USBdrive|/data/backups|' ncp-config.d/nc-backup.sh; \
rm /usr/local/etc/ncp.sh; \
rm /.ncp-image; \
-# remove wizard for now
-rm -r /var/www/ncp-web/wizard; \
-
# cleanup all NCP extras
source /usr/local/etc/library.sh; \
cd /usr/local/etc/ncp-config.d/; \
diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile
index 9f616cd7b..f5d41538e 100644
--- a/docker/nextcloudpi/Dockerfile
+++ b/docker/nextcloudpi/Dockerfile
@@ -32,9 +32,6 @@ sed -i 's|/media/USBdrive|/data/backups|' ncp-config.d/nc-backup.sh; \
rm /usr/local/etc/ncp.sh; \
rm /.ncp-image; \
-# remove wizard for now
-rm -r /var/www/ncp-web/wizard; \
-
# cleanup all NCP extras
source /usr/local/etc/library.sh; \
cd /usr/local/etc/ncp-config.d/; \
diff --git a/ncp-web/index.php b/ncp-web/index.php
index 24a24f7a2..9e2daa122 100644
--- a/ncp-web/index.php
+++ b/ncp-web/index.php
@@ -168,13 +168,12 @@
-
-
+ echo <<
+
+
HTML;
?>
diff --git a/ncp-web/wizard/JS/wizard.js b/ncp-web/wizard/JS/wizard.js
index 130dd8a00..e57b1282f 100644
--- a/ncp-web/wizard/JS/wizard.js
+++ b/ncp-web/wizard/JS/wizard.js
@@ -2,6 +2,8 @@
/*global $, jQuery, alert*/
$(document).ready(function(){
+ var in_docker = $('#in-docker');
+
function addNotification( txt, tclass )
{
// limit to 9 notifications
@@ -185,12 +187,15 @@ $(document).ready(function(){
// Enable external access step
$('#enable-external').on('click', function(){
- launch_action( 'fail2ban',
- { "ACTIVE":"yes" },
- function ( data ){
- nextOnSuccess( data, function(){ show_with_animation( 'forward-ports-pane' ) } );
- }
- );
+ if ( !in_docker )
+ launch_action( 'fail2ban',
+ { "ACTIVE":"yes" },
+ function ( data ){
+ nextOnSuccess( data, function(){ show_with_animation( 'forward-ports-pane' ) } );
+ }
+ );
+ else
+ show_with_animation( 'forward-ports-pane' );
});
// Skip external access step
diff --git a/ncp-web/wizard/index.php b/ncp-web/wizard/index.php
index b96e6839d..389d778c1 100644
--- a/ncp-web/wizard/index.php
+++ b/ncp-web/wizard/index.php
@@ -29,7 +29,13 @@
@@ -208,8 +214,13 @@
';
+
+ // Mark the wizard as "in docker"
+ if ( file_exists( '/.docker-image' ) )
+ echo '
';
?>