MagicMirror v2.1.0 Update error

lolobyte

How can i fix that?

pi@raspi3-MM2:~/MagicMirror $ sudo git pull
Aktualisiere b8167f8…8010e62
error: Your local changes to the following files would be overwritten by merge:
css/main.css
modules/default/clock/clock.js
modules/default/compliments/compliments.js
modules/default/currentweather/currentweather.css
modules/default/currentweather/currentweather.js
package.json
Please, commit your changes or stash them before you can merge.
Aborting

yawns

So you modified the original files which you should not do.

Look at the first answer here to see your possibilities: http://stackoverflow.com/questions/15745045/how-do-i-resolve-git-saying-commit-your-changes-or-stash-them-before-you-can-me

lolobyte

@yawns
Thank u.
Now i have this error!

npm WARN grunt-yamllint@0.2.0 requires a peer of grunt@~0.4.0 but none was installed.

lolobyte

Hello,

    ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],

I can’t insert my ip from my laptop.
I want to access MagicMirror from laptop with Remote Control, but it’s not possible now with this update.

Where i have to insert my ip address in the white-list?

PindaPower

If the original this is:

Blockquote ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”],

Then I guess that the modifed can look like this:

Blockquote ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”, “192.168.0.1”, “192.168.250.250”],

If you dont get the “::ffff:127.0.0.1” lookup “ipv4 to ipv6 translation” on google.

lolobyte

@PindaPower

Hi,

at this position i must insert my ip from the notebook?

ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”, “XXX.XXX.XXX.XXX”, “192.168.250.250”],

And how to declare a range?

lolobyte

nobody can help.

I going to be crazy soon with this damn IP’s

ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”],

Can somebody put a example of a running ip address with a virtual IP like 192.168.123.123 to give access to remote control module ?

Snille

This should do it.

For a B-network (192.168.x.x)
The last two “x”:es change.

ipWhitelist: [
	"127.0.0.1",
	"::ffff:127.0.0.1",
	"::1",
	"::ffff:192.168.0.1/16" 
],

Or for a C-network (192.168.123.x)
Only the last “x” change.

ipWhitelist: [
	"127.0.0.1",
	"::ffff:127.0.0.1",
	"::1",
	"::ffff:192.168.123.1/24" 
],

Good luck.

Steff

This post is deleted!

schlachtkreuzer6

@yawns so how do i change the comments if i should´t change the comments.js ? ^^