mirror of https://github.com/micromata/borgbackup-butler.git
parent: d0a90612 | patch | commit | ignore whitespace
Kai Reinhard
16.02.2018 3d25cd42900e130c661ad2943540b0007e07d262 
Default port is now 9042 (8042 is Merlin default port).
2 files modified
4 ■■■■■ changed files
borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfigurationHandler.java 2 ●●●●● patch | view | raw | blame | history
borgbutler-webapp/src/utilities/global.js 2 ●●●●● patch | view | raw | blame | history 
 borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfigurationHandler.java


@@ -13,7 +13,7 @@


    private Logger log = LoggerFactory.getLogger(ServerConfigurationHandler.class);


    private static final ServerConfigurationHandler instance = new ServerConfigurationHandler();


    private static final String WEBSERVER_PORT_PREF = "webserver-port";


    public static final int WEBSERVER_PORT_DEFAULT = 8042;


    public static final int WEBSERVER_PORT_DEFAULT = 9042;


    private static final String LANGUAGE_PREF = "language";


    private static final String LANGUAGE_DEFAULT = null;


    private static final String SHOW_TEST_DATA_PREF = "show-test-data";




 borgbutler-webapp/src/utilities/global.js


@@ -4,7 +4,7 @@


    return process.env.NODE_ENV === 'development';


}




global.testserver = 'http://localhost:8042';


global.testserver = 'http://localhost:9042';


global.restBaseUrl = (isDevelopmentMode() ? global.testserver : '') + '/rest';




// Remove registered server workers from Merlin version <= V0.5 and get rid of caching hell: