loolwsd/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7bb1fa2908aeef2e40fcdbe7c4c649694188dabb
Author: Jan Holesovsky <ke...@collabora.com>
Date:   Mon May 9 10:41:36 2016 +0200

    'make run' should enable the admin console too.
    
    'make run' must _not_ be used for a production environment already anyway 
due
    to the --allowlocalstorage, so allowing the admin console with some trivial
    credentials is hopefully OK.

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 5ba1681..d017529 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -137,7 +137,7 @@ run: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
                echo "   
$$PROTOCOL://localhost:9980/loleaflet/@LOOLWSD_VERSION@/loleaflet.html?file_path=file://$(abs_top_srcdir)/test/data/hello-world.odt"
        @echo
        ./loolwsd --systemplate="@SYSTEMPLATE_PATH@" --lotemplate="@LO_PATH@" \
-                  --childroot="@JAILS_PATH@" --allowlocalstorage
+                  --childroot="@JAILS_PATH@" --allowlocalstorage 
--admincreds=admin/admin
 else
 
 SYSTEM_STAMP =
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to