From 056ea2b8bd3b073887f0fb173b78faa4bce48087 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sat, 15 Apr 2017 14:00:41 +0100 Subject: [PATCH] Possibly fix #79 --- _embed/templates/base.tmpl | 2 +- assets/binary.go | 4 ++-- config/commands.go | 2 +- config/config.go | 13 +++++++++++-- filemanager.go | 2 +- page/version.go | 4 ++-- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/_embed/templates/base.tmpl b/_embed/templates/base.tmpl index df68bcd7..01c28bac 100644 --- a/_embed/templates/base.tmpl +++ b/_embed/templates/base.tmpl @@ -14,7 +14,7 @@ diff --git a/assets/binary.go b/assets/binary.go index 407ca3a2..4c7f5480 100644 --- a/assets/binary.go +++ b/assets/binary.go @@ -411,7 +411,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _templatesBaseTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xe4\x5a\xdf\x6f\xe3\x36\xf2\x7f\x2f\xd0\xff\x61\x2a\x14\x68\x82\x6f\x2d\x7d\xbb\x7d\x39\xa4\xb2\x8a\xbd\x24\x45\xf7\x6e\xb3\xbb\x68\x76\x7b\xb8\x27\x83\x16\xc7\x16\x1b\x8a\x54\x49\xca\x8e\x63\xf8\x7f\x3f\x90\xa2\x64\xd9\x96\xfc\x2b\xc9\xe1\x70\xb7\x2f\x59\x53\x9c\x0f\x67\x3e\x33\xc3\x19\x52\x8a\xbf\xb9\xf9\x78\xfd\xf9\x9f\x9f\x6e\x21\x33\x39\x4f\xbe\xfe\x2a\xf6\x7f\x97\x4b\xf8\x96\x8c\xf5\x97\xdf\xde\xc3\xd5\x10\xc2\x6b\x29\x26\x6c\x1a\xbe\x1d\x6b\xc9\x4b\x83\x76\x78\xb5\xb2\xb3\x91\xd0\xe4\xeb\xaf\x00\x00\x62\xc3\x0c\xc7\x64\xb9\x0c\x3f\x90\x1c\x57\xab\x38\xaa\x06\xfc\xd3\x1c\x0d\x01\x41\x72\x1c\x06\x33\x86\xf3\x42\x2a\x13\x40\x2a\x85\x41\x61\x86\xc1\x9c\x51\x93\x0d\x29\xce\x58\x8a\x03\xf7\xe3\x7b\x60\x82\x19\x46\xf8\x40\xa7\x84\xe3\xf0\x87\xef\x21\x27\x8f\x2c\x2f\xf3\xf5\x40\xa9\x51\xb9\x5f\x64\xcc\x71\xf8\xff\xc1\xc6\x5a\x69\x46\x94\x46\x33\x0c\x4a\x33\x19\xfc\xa5\x79\xc6\x99\x78\x00\x85\x7c\x18\x68\xb3\xe0\xa8\x33\x44\x13\x40\xa6\x70\x32\x0c\x96\xcb\x1e\x4b\xa3\xd1\x84\x71\xcc\x89\x20\x53\x54\x4c\x18\x54\x82\xf0\x28\xd5\x3a\x12\x52\xe5\x84\xb3\x27\x0c\x53\xad\x5f\x6b\x91\x89\x14\x46\xbf\xe6\x02\x15\x48\x7b\x85\xe5\x72\x00\x6c\x02\x02\x21\xfc\xa2\x51\x85\xf7\x76\xc6\xbd\x5d\x06\x82\x00\x06\xd6\xf9\x4e\x11\x27\x99\x2c\x97\x70\x7d\x7f\xbf\x3b\xd5\x46\x41\x35\x63\x8d\x8a\x82\x56\xf2\x35\x42\xaa\x58\x61\xfc\x84\x19\x51\xce\xab\x30\x84\xbf\xdd\x7f\xfc\x10\x16\xd6\x87\x17\xdf\x2d\x97\x70\x47\x94\xce\x08\xaf\xd6\x80\xd5\xea\xbb\xcb\xef\x2b\x11\xfb\x6f\x8e\x63\x4a\x66\xd6\xca\x21\x04\xcb\x65\x87\xf9\xab\xd5\x7a\xf8\x1f\x38\xbe\x71\xb3\x57\xab\xa0\x05\x32\x26\x1a\xf7\x43\xb4\x67\x17\x0a\x27\xec\xb1\x99\xdf\x50\xfe\xa9\x19\x5f\xad\x82\x9f\xbc\x8d\xd1\x86\x91\xde\x64\xd0\x2a\x3d\xd9\x5b\x7f\xe8\x28\x95\x79\x2e\x45\xf8\x87\x0e\x80\xe2\x04\x55\xb2\x05\xef\x5d\x17\xbe\xd3\x37\x4c\xc1\xda\x53\xcf\x5a\x94\x33\x6d\x98\x98\xee\x5f\x15\xb9\xc6\x17\x59\x90\xa4\x18\x69\x95\x0e\x72\x26\xec\xff\xbb\x56\x7d\x09\xa3\x66\x28\xa8\x54\xd1\x44\xaa\xfc\xcd\x1f\xba\xdf\xb6\x67\x2e\x83\x94\x19\xa9\x0e\x50\x27\x68\xc3\x5c\xed\x40\xbf\xca\xaf\xe5\x54\xde\x0a\xbb\xc5\xd1\x93\xc9\xcd\xca\xa9\x6c\xab\x42\x8a\x82\xb3\x94\x18\x76\x28\x80\x6a\x7d\xe2\xc8\x6f\xf1\xf1\x58\xd2\x45\xcd\x87\x1d\x43\x95\xac\xb3\x21\xa6\x6c\x06\x8c\x0e\x03\x23\x8b\xc1\x98\xa8\xa0\xf5\xac\x7e\x9e\xc4\x45\xf2\x0b\xe3\x08\x77\x15\x45\x71\x54\x24\x71\x64\x1f\xec\xce\x75\x58\x1a\x89\x4a\xb3\x6d\x28\x37\x85\x41\xca\x89\xd6\xc3\x20\x27\x06\x95\xad\x12\x2c\x95\x42\x07\xe0\x6a\xce\x30\xb8\xf7\xa2\x15\x44\x1c\xb1\x4e\x10\x51\x94\x06\xcc\xa2\xc0\x61\x60\xf0\xd1\x04\x50\x70\x92\x62\x26\x39\x45\x55\x63\x80\x54\x80\x8f\x98\x96\x06\x81\x80\xcd\x3d\x22\x68\x18\x86\x9d\x6a\xed\x1a\xb3\xf1\xe8\xbd\x24\xd4\x26\x51\x18\x76\xd9\xdd\x4c\x2d\x92\x3e\xfb\x40\x17\x4c\x04\x09\x29\x8d\x54\x28\x70\x6e\x0d\xb3\x34\x76\xa8\xd2\x45\xac\x1f\xeb\xa0\xdb\xaf\x46\x52\x1b\x19\x81\x63\x9f\xcb\xa9\x2c\xcd\x59\xec\xbf\xf7\xa2\xf8\xc8\xcc\xc8\xc8\x11\x29\x8a\x5d\x17\x6c\x6b\xb8\xab\x5d\x13\x08\x63\x69\x8c\xcc\x7b\xe3\x6a\x57\xc3\x56\xf5\xb2\xcd\x08\x04\x51\x50\x67\xce\x8e\xe9\x94\x18\x32\xa0\x4a\x16\x54\xce\x45\x17\x11\x85\xc2\x19\x93\xa5\xee\xa2\x62\x2f\x1d\x89\x2e\xc7\x94\x29\x4c\x8d\x54\x8b\x11\x51\x4a\xce\x47\x1c\x27\xa6\x3b\x1c\x1d\x54\xc9\x6b\xac\x5a\xa3\x4a\x87\xb1\x42\x42\x53\x55\xe6\xe3\x5e\x35\xac\xcd\x8a\x88\x29\xc2\xb7\xcc\x60\xee\xda\xb6\xbf\x36\x62\x77\xa4\x80\x2e\x0a\x9a\x95\xc9\xba\x7b\xa8\x1b\x3f\x5b\x33\x2b\xb0\xd0\xd7\xb3\x24\xe6\x2c\x69\x06\x1d\xb5\xb6\xc4\x73\x1b\x85\x64\x8f\x5e\xed\xdd\x6d\x67\xe5\xa8\xe4\x47\x06\xf0\x36\x5c\xd7\xd3\x5d\xbf\xc7\x85\xa3\x30\x2d\x95\x42\x61\x06\x76\x93\x0e\xac\x11\x6b\xfd\x0b\xfb\xb3\x4b\xc7\x63\x33\x46\x57\xeb\x36\x25\x17\x28\xd3\x6e\xc3\x6e\x70\x2b\x37\xda\xb5\x07\x52\xf0\x45\x97\x13\x7d\xd0\x12\x41\xe1\x42\x48\xe3\xd1\x2e\xe1\xa2\x6a\xab\xde\x72\x2e\xe7\xb7\x94\x99\xcb\x4e\x2a\xeb\xa2\x71\xeb\x8a\x4d\x1f\x3b\x6e\x0e\xfe\x09\xe1\x0d\x31\x24\xbc\x93\x14\x21\xc8\x89\x7a\xa8\x22\xad\x37\x47\xfa\xb2\x02\xe7\x01\x48\x91\x72\x96\x3e\x0c\x03\x21\xcd\xbb\xbc\xe0\x98\xa3\x30\x48\x2f\x70\x86\xc2\x5c\xfe\x74\x72\xd6\xd4\x9b\xc8\x27\xbf\x40\xa2\x30\x97\x33\x1c\x29\xa4\x23\x5c\x60\xcf\x5e\x7e\x66\xb4\x6c\xf2\xf1\x3b\xd3\x25\xe1\x60\x54\x89\x27\x71\x61\x0b\xfc\x40\xcb\x52\xa5\x78\xb6\xb9\x9f\xe5\x74\xca\x11\x2c\x14\xd4\x50\xa9\xa4\xcf\xb0\xf7\x34\x2e\xfa\x6c\xd3\x64\x76\xbe\x51\xf7\x4e\xd8\x42\xbc\x82\xdb\xb6\x1a\xdc\x63\x8c\x91\x05\x8a\xf3\x8d\x41\x04\x45\xe6\x41\x62\x51\x46\x4c\x8c\x7c\x01\xee\x81\xd3\x05\x11\x89\x97\x89\x23\xf7\xeb\x85\x09\x70\x3b\xc5\xce\xe6\x70\x51\xef\x1b\xa7\x10\x63\x33\xec\x6c\x62\xee\x9c\xf0\x44\xaa\x39\x51\xf4\x10\x23\x76\x32\xd8\x7d\xf0\xf5\x38\xf1\x81\xb1\xc5\xcc\x49\x7c\x28\x14\x24\x3f\x9f\x11\xbb\x5e\x90\xe4\x92\xe2\xc8\x26\xf4\x2b\x04\xbf\xb3\x73\xcb\xc0\x33\x12\x82\x22\x47\x73\xbe\x9d\x37\x5e\xbc\x82\x71\xdd\xa8\x73\xea\x8d\xff\xfd\x0c\x0f\x77\xcd\x3f\x54\x86\x21\x97\xe3\xa6\xc2\xfa\xb8\x56\x9d\xd6\xf5\xf7\x6c\x56\x62\x34\x43\xd5\xe1\xb4\xa3\xbb\x01\xbf\x36\x61\x62\x50\x8f\xf4\xd7\xfb\x33\xbc\x56\xd5\xc5\xfe\x76\xab\xae\x69\x4c\x17\x9c\x2c\x20\xc8\xa5\x26\x2c\xed\xae\xef\xcd\x5a\x75\x03\xf8\x33\xad\xc4\x86\xf6\xc8\x1f\xf4\x1e\x45\xd6\xdb\xe2\x9c\x99\x34\x83\xdf\x9d\x4e\x56\xb3\x91\x15\x5c\xc7\x82\x7f\x6e\x9f\xf8\x80\x38\xd0\x2b\xb6\x2f\x11\x8e\xd3\xd4\xdb\x77\x8e\xae\xb9\xa4\x25\xc7\x67\x68\xdb\x53\x6c\xbb\x63\xa5\xdb\xa9\x1d\x61\x5b\x72\xc3\x0a\x8e\x03\x8d\x1c\xdd\x1c\x17\x48\x33\x72\x46\xae\x26\x69\x86\xe9\xc3\x28\x65\x2a\xdd\x30\xd4\x21\xff\x7b\x0a\xd3\x07\x9c\x9f\x59\x97\xca\x82\x4b\x42\xcf\xde\x9f\xbe\x78\x71\x5b\x6f\x46\x15\xd6\x9a\x81\x2f\xfe\xf7\x6b\x30\xb0\xee\xdf\xff\xc7\xfb\x93\xed\x1a\xb5\x71\xb2\xf9\xef\xa8\x54\x3d\x36\x6c\x1d\x09\x37\xae\x19\x9a\x63\x61\xa7\xa5\x72\x2e\xf6\x45\xfd\x4e\x88\xad\x56\xad\x2d\xd1\x0b\x0f\xed\x21\x26\xe8\x3b\xd7\x1e\x4f\x5b\xa3\x8b\x4b\xa1\x1a\xbd\xc5\x5f\x33\xd2\xc3\x60\x9f\xc6\x11\x69\x2b\xb7\x57\x6e\x4f\x22\xc1\xbe\x4b\x93\x5a\x5b\x47\x7b\x1f\x9b\x50\x55\x14\xe7\x9e\x89\x54\x39\x31\xc3\xe0\x89\x15\xc1\x0e\xa1\x76\xd0\xdd\x7f\x3c\xb1\xe2\xc0\x95\x47\x17\xa6\x21\x6a\x17\xd3\x0e\x3a\x4c\x43\xd4\x79\x98\xd3\xa7\x4e\xd4\xe9\x53\x83\x1b\x4e\x9f\xce\x83\x1e\x3f\xbd\xe9\xc4\xb6\xe3\x0d\xf8\xf8\xe9\xcd\xcb\xa2\x3f\xb6\x34\x7f\x3c\xa4\x79\xcf\xdd\x11\xbc\x60\x71\xae\x42\x89\x89\x89\x7c\xbd\xab\x8e\x77\x16\x3d\xb1\x6b\xac\x13\xeb\x9d\xfb\x75\xc2\xb6\x74\xc2\x7d\xaa\xb3\x62\x20\x67\xa8\x38\x59\x04\x1b\x97\xf0\xd5\x7d\xbf\xbb\xdb\xf7\x03\xb5\xd0\x6e\x4f\x12\x34\x66\xb5\xfa\x97\xb6\x06\x45\x72\xe7\x85\xa0\x11\x02\xac\x5e\x65\x6c\x5e\x5b\xf7\x9e\x4b\x77\x1b\xa1\x94\x88\x14\xf9\xce\x45\xf0\x21\x8e\xaf\x39\xda\x64\x4b\xed\x9f\xcd\xaa\xb8\x69\x7e\x9b\xb4\xd8\xb6\xf0\xad\x99\x36\xa6\x0c\xe6\x05\x27\x06\x21\xf0\x2f\xaf\x03\x08\xd7\xaf\x65\x22\x2f\xd1\xe2\xce\xab\xb5\xc3\x76\x35\xe5\xa4\x8e\xa9\x8d\x37\xe1\x92\x18\x26\xa6\xc1\x11\x2c\x8a\xdd\xe3\xc2\x41\xbe\x3e\xe0\xdc\x1d\xd3\x41\x2a\x68\x2e\xb1\x83\x84\x50\x7a\x98\x3d\xe8\xac\x90\x71\x43\x9d\xd5\xe9\xcf\x12\xb5\xf3\x67\x3d\xba\x61\x88\xdd\x28\x6a\x05\x0b\x25\xf3\x62\xe7\x45\x44\x9c\xfd\x98\xc4\x51\xf6\xe3\xf6\x70\xd1\xf1\x42\xc4\xbf\xe9\x21\xa5\x91\x13\x99\x96\xba\xfd\xce\xe7\xb8\x17\x0a\xf1\xb8\x34\x46\x0a\x2f\xa8\xcb\x71\xce\x4c\xd0\x02\xac\x9d\xfc\x10\x24\x1f\xff\x1e\x47\xd5\xec\x3d\x38\x7e\xbe\x8f\xe5\xf5\xc6\x92\x72\xa9\xf1\x93\x33\x78\xbd\xab\x5c\xbb\x59\x3d\xa8\xbb\x69\x6f\xb9\x6b\x1c\x52\xb3\x9b\x74\x7b\xc1\xee\x39\xdd\x1e\x68\x85\xd2\x0b\x38\xe0\x14\x56\xf7\x92\x71\x14\xd3\x7d\x5b\xe1\x51\x94\xe4\x72\x86\xdd\x94\x7c\x33\x18\xc0\xe7\x8f\x37\x1f\xaf\xe0\xad\xa0\x60\x32\x84\x31\x49\x1f\xa0\x52\xe1\x67\xb8\xba\x84\xc1\xe0\xf4\x20\xbe\x93\x33\xec\xe6\xf1\x3a\x93\x52\x23\x08\x9c\x43\x26\x4b\x8d\x30\x91\x0a\x16\xb2\x54\x2e\x31\x2f\xf4\x65\x34\x71\xaf\x2a\x2f\xf4\xe5\x55\xc5\x79\xff\xcd\x84\x7b\xf3\x50\x9d\xe8\x3b\xfc\xd0\xf3\x06\x66\x67\xb8\xe7\x06\xa4\x48\xae\xab\x97\x2b\x7c\x01\x82\xcc\xd8\xd4\xed\x4c\x20\xc5\x15\xc4\xa9\xa4\x98\xc4\x91\xfb\x13\xf6\x69\xf9\xbc\x8c\xab\x18\xfc\x4f\xce\xb9\x96\x23\x32\xe4\x1b\xbd\xa8\x0d\x81\x5f\x91\x17\x3e\x04\x5a\x0f\x76\xd9\xb7\xbd\x90\x36\x4a\x8a\x69\xf2\xcb\x0f\x71\xe4\xff\x0b\x03\x30\x19\xd3\x60\x73\xd9\xb6\x57\x4c\x0a\xd7\x36\xed\x11\x7e\xd3\x16\xae\xee\x3a\xfd\x9d\xec\x5e\xb9\x9b\xdb\xf7\x6d\xc1\xea\x2c\xe5\x4b\x3b\x52\x60\x06\x73\x7d\x00\xe2\xf6\xfe\xba\x0d\xe1\xca\x71\xab\x39\x20\x82\x46\x52\x81\x73\x89\xcb\xb0\x2a\x6f\x0e\x80\x5e\x7f\xfe\xed\x3d\xfc\x1f\xdc\xb7\x91\x35\x99\x21\x90\x75\x09\xf3\x2d\xa6\x03\x6d\xea\x19\xcc\x33\x54\x68\x73\x0a\x88\x3a\x64\xbd\x5f\xe5\xda\x46\xcd\xc6\x4a\x4e\x7b\xa8\x5b\x15\xb7\xa4\x6e\x97\x4d\x86\x87\x58\xb9\x91\xe5\x98\x23\xa4\xdb\xd0\xf6\x24\xdf\x36\xa2\xd6\xfb\x90\xa6\x3d\x2a\x1e\xc2\xf1\x19\xbf\xd1\xc1\x7d\x90\x06\xc8\x8c\x30\xf7\x8d\x1d\x2c\xd0\x6c\xe7\xf0\xfe\x38\x7d\xcb\xcd\x1e\xce\x08\x4c\x95\x2c\x0b\x90\x93\x8a\xb5\x83\xfa\x74\xb4\xbd\x47\xd4\x10\x9b\x5f\xc7\x57\x90\x3d\xfd\xe0\x44\x4a\x83\x2a\xb9\x47\x35\x43\x0a\x73\x66\x32\x7b\xb4\x71\xdf\xe1\x09\x69\x9d\x85\x0a\x84\x54\x38\x41\xa5\xb0\x39\xef\x65\xc6\x14\xfa\x2a\x8a\x52\x42\xe9\x42\x5b\x59\x15\xa6\x32\xb7\x9b\x0c\xa5\x0b\x7b\xba\x71\xfd\xdf\x09\x48\x53\x66\xb2\x72\x6c\x41\xa2\x8c\xa4\x94\x11\x5d\x81\x0f\x5a\x5f\x20\x05\x5b\x1f\xdb\x90\x24\x84\xdf\x70\xc6\xb4\xcd\xb3\xea\x93\xa1\x3c\x77\xaf\x45\x42\xbb\x7f\x39\xc3\xbe\xfe\x2a\x8e\xfc\x77\x3e\x71\xe4\xbf\x04\xfd\x57\x00\x00\x00\xff\xff\x0d\x8f\xa4\x4c\x23\x2a\x00\x00") +var _templatesBaseTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xe4\x5a\x5f\x6f\xdb\x38\x12\x7f\x2f\xd0\xef\x30\x2b\x2c\xb0\x09\xae\xb6\x6e\xbb\x2f\x87\xac\xac\x45\x2f\xc9\x62\x7b\x97\xb4\x45\xd3\xee\xe1\x9e\x0c\x5a\x1c\x5b\x6c\x28\x52\x4b\x52\x76\x1c\xc3\xdf\xfd\x40\x8a\x92\x65\x5b\xf2\xbf\x24\x87\xc3\x6d\x5e\x1c\x51\x9c\x7f\xbf\x99\xe1\x0c\x49\x45\xdf\x5d\x7d\xbc\xfc\xf2\xef\x4f\xd7\x90\x9a\x8c\xc7\xaf\x5f\x45\xfe\x77\xb1\x80\xef\xc9\x48\x7f\xfd\x7c\x03\x17\x03\xe8\x5f\x4a\x31\x66\x93\xfe\xbb\x91\x96\xbc\x30\x68\x87\x97\x4b\x3b\x1b\x09\x8d\x5f\xbf\x02\x00\x88\x0c\x33\x1c\xe3\xc5\xa2\xff\x81\x64\xb8\x5c\x46\x61\x39\xe0\xdf\x66\x68\x08\x08\x92\xe1\x20\x98\x32\x9c\xe5\x52\x99\x00\x12\x29\x0c\x0a\x33\x08\x66\x8c\x9a\x74\x40\x71\xca\x12\xec\xb9\x87\x37\xc0\x04\x33\x8c\xf0\x9e\x4e\x08\xc7\xc1\x8f\x6f\x20\x23\x0f\x2c\x2b\xb2\xd5\x40\xa1\x51\xb9\x27\x32\xe2\x38\xf8\x6b\xb0\x26\x2b\x49\x89\xd2\x68\x06\x41\x61\xc6\xbd\xbf\xd5\xef\x38\x13\xf7\xa0\x90\x0f\x02\x6d\xe6\x1c\x75\x8a\x68\x02\x48\x15\x8e\x07\xc1\x62\xd1\x61\x69\x38\x1c\x33\x8e\x19\x11\x64\x82\x8a\x09\x83\x4a\x10\x1e\x26\x5a\x87\x42\xaa\x8c\x70\xf6\x88\xfd\x44\xeb\x97\x12\x32\x96\xc2\xe8\x97\x14\x50\x32\x69\x4a\x58\x2c\x7a\xc0\xc6\x20\x10\xfa\x5f\x35\xaa\xfe\x9d\x9d\x71\x67\xc5\x40\x10\x40\xcf\x3a\xdf\x29\xe2\x28\xe3\xc5\x02\x2e\xef\xee\xb6\xa7\xda\x28\x28\x67\xac\xb8\xa2\xa0\x25\x7d\xc5\x21\x51\x2c\x37\x7e\xc2\x94\x28\xe7\x55\x18\xc0\x3f\xee\x3e\x7e\xe8\xe7\xd6\x87\x67\x3f\x2c\x16\x70\x4b\x94\x4e\x09\x2f\x65\xc0\x72\xf9\xc3\xf9\x9b\x92\xc4\xfe\xcd\x70\x44\xc9\xd4\x5a\x39\x80\x60\xb1\xd8\x34\xff\x5f\xf5\xeb\xe5\x32\x68\x90\x8d\x88\xc6\x4e\xa2\xaf\x9f\x6f\xd6\x67\xe7\x0a\xc7\xec\xa1\x9e\x5f\x83\xfc\xa9\x1e\x5f\x2e\x83\x9f\xbd\x55\xe1\x9a\x59\xde\x48\xd0\x2a\x39\xda\x3f\xdf\x74\x98\xc8\x2c\x93\xa2\xff\x4d\x07\x40\x71\x8c\x2a\xde\x60\xef\x9d\xd5\x7f\xaf\xaf\x98\x82\x95\x6f\x9e\x24\x94\x33\x6d\x98\x98\xec\x96\x8a\x5c\xe3\xb3\x08\x24\x09\x86\x5a\x25\xbd\x8c\x09\xfb\x7f\x9b\xd4\xe7\x30\x6a\x8a\x82\x4a\x15\x8e\xa5\xca\xde\x7e\xd3\xdd\xb6\x3d\x51\x0c\x52\x66\xa4\xda\x03\x9d\xa0\x35\x72\x95\x03\xbd\x94\xdf\x8a\x89\xbc\x16\x76\x51\xa3\x47\x83\x9b\x16\x13\xd9\x54\x85\xe4\x39\x67\x09\x31\x6c\x5f\x00\x55\xfa\x44\xa1\x5f\xd4\xa3\x91\xa4\xf3\x0a\x0f\x3b\x86\x2a\x5e\x65\x43\x44\xd9\x14\x18\x1d\x04\x46\xe6\xbd\x11\x51\x41\xe3\x5d\xf5\x3e\x8e\xf2\xf8\x57\xc6\x11\x6e\x4b\x88\xa2\x30\x8f\xa3\xd0\xbe\xd8\x9e\xeb\x78\x69\x24\x2a\x49\x37\x59\xb9\x29\x0c\x12\x4e\xb4\x1e\x04\x19\x31\xa8\x6c\x5d\x60\x89\x14\x3a\x00\x57\x65\x06\xc1\x9d\x27\x2d\x59\x44\x21\x6b\x65\x22\xf2\xc2\x80\x99\xe7\x38\x08\x0c\x3e\x98\x00\x72\x4e\x12\x4c\x25\xa7\xa8\x2a\x1e\x20\x15\xe0\x03\x26\x85\x41\x20\x60\x73\x8f\x08\xda\xef\xf7\x5b\xd5\xda\x36\x66\xed\xd5\x8d\x24\xd4\x26\x51\xbf\xdf\x66\x77\x3d\x35\x8f\xbb\xec\x03\x9d\x33\x11\xc4\xa4\x30\x52\xa1\xc0\x99\x35\xcc\xc2\xd8\xa2\x4a\x1b\xb0\x7e\xac\x05\x6e\x2f\x8d\x24\x36\x32\x02\x87\x3e\x97\x13\x59\x98\x93\xd0\xbf\xf1\xa4\xf8\xc0\xcc\xd0\xc8\x21\xc9\xf3\x6d\x17\x6c\x6a\xb8\xad\x5d\x1d\x08\x23\x69\x8c\xcc\x3a\xe3\x6a\x5b\xc3\x46\xbd\xb2\xed\x07\x04\x61\x50\x65\xce\x96\xe9\x94\x18\xd2\xa3\x4a\xe6\x54\xce\x44\x1b\x10\xb9\xc2\x29\x93\x85\x6e\x83\x62\x27\x1c\xb1\x2e\x46\x94\x29\x4c\x8c\x54\xf3\x21\x51\x4a\xce\x86\x1c\xc7\xa6\x3d\x1c\x1d\xab\x82\x57\xbc\x2a\x8d\x4a\x1d\x46\x0a\x09\x4d\x54\x91\x8d\x3a\xd5\xb0\x36\x2b\x22\x26\x08\xdf\x33\x83\x99\x6b\xd4\xfe\x5e\x93\xdd\x92\x1c\xda\x20\xa8\x25\x93\x55\xbf\x50\xb5\x7a\xcb\xa5\x7d\xb0\xcc\xfa\xbe\x9e\xc5\x11\x67\x71\x3d\xe8\xa0\xb5\x45\x9d\xdb\x28\x24\x3b\xf4\x6a\xae\x6e\x5b\x92\xc3\x82\x1f\x18\xc0\x9b\xec\xda\xde\x6e\xfb\x3d\xca\x1d\x84\x49\xa1\x14\x0a\xd3\xb3\x8b\x74\x60\x8d\x58\xe9\x9f\xdb\xc7\x36\x1d\x0f\xcd\x18\x5d\xca\xad\x4b\x2e\x50\xa6\xdd\x82\x5d\xf3\x2d\xdd\x68\x65\xf7\xa4\xe0\xf3\x36\x27\xfa\xa0\x25\x82\xc2\x99\x90\xc6\x73\x3b\x87\xb3\xb2\x91\x7a\xc7\xb9\x9c\x5d\x53\x66\xce\x5b\xa1\xac\x8a\xc6\xb5\x2b\x36\x5d\xe8\xb8\x39\xf8\x07\xf4\xaf\x88\x21\xfd\x5b\x49\x11\x82\x8c\xa8\xfb\x32\xd2\x3a\x73\xa4\x2b\x2b\x70\x16\x80\x14\x09\x67\xc9\xfd\x20\x10\xd2\xbc\xcf\x72\x8e\x19\x0a\x83\xf4\x0c\xa7\x28\xcc\xf9\xcf\x47\x67\x4d\xb5\x88\x7c\xf2\x02\x62\x85\x99\x9c\xe2\x50\x21\x1d\xe2\x1c\x3b\xd6\xf2\x13\xa3\x65\x1d\x8f\xdf\x99\x2e\x08\x07\xa3\x0a\x3c\x0a\x0b\x5b\xe0\x7b\x5a\x16\x2a\xc1\x93\xcd\xfd\x22\x27\x13\x8e\x60\x59\x41\xc5\x2a\x91\xf4\x09\xf6\x1e\x87\x45\x97\x6d\x9a\x4c\x4f\x37\xea\xce\x11\x5b\x16\x2f\xe0\xb6\x8d\x06\xf7\x10\x63\x64\x8e\xe2\x74\x63\x10\x41\x91\x59\x10\x5b\x2e\x43\x26\x86\xbe\x00\x77\xb0\xd3\x39\x11\xb1\xa7\x89\x42\xf7\xf4\xcc\x00\xb8\x95\x62\x6b\x71\x38\xab\xd6\x8d\x63\x80\xb1\x19\x76\x32\x30\xb7\x8e\x78\x2c\xd5\x8c\x28\xba\x0f\x11\x3b\x19\xec\x3a\xf8\x72\x98\xf8\xc0\xd8\x40\xe6\x28\x3c\x14\x0a\x92\x9d\x8e\x88\x95\x17\xc4\x99\xa4\x38\xb4\x09\xfd\x02\xc1\xef\xec\xdc\x30\xf0\x84\x84\xa0\xc8\xd1\x9c\x6e\xe7\x95\x27\x2f\xd9\xb8\x6e\xd4\x39\xf5\xca\x3f\x3f\xc1\xc3\x6d\xf3\xf7\x95\x61\xc8\xe4\xa8\xae\xb0\x3e\xae\x55\xab\x75\xdd\x3d\x9b\xa5\x18\x4e\x51\xb5\x38\xed\xe0\x6e\xc0\xcb\x26\x4c\xf4\xaa\x91\xee\x7a\x7f\x82\xd7\xca\xba\xd8\xdd\x6e\x55\x35\x8d\xe9\x9c\x93\x39\x04\x99\xd4\x84\x25\xed\xf5\xbd\x96\x55\x35\x80\xbf\xd0\x92\x6c\x60\xb7\xfc\x41\xe7\x56\x64\xb5\x2c\xce\x98\x49\x52\xf8\xdd\xe9\x64\x35\x1b\x5a\xc2\x55\x2c\xf8\xf7\xf6\x8d\x0f\x88\x3d\xbd\x62\xf3\x10\xe1\x30\x4d\xbd\x7d\xa7\xe8\x9a\x49\x5a\x70\x7c\x82\xb6\x1d\xc5\xb6\x3d\x56\xda\x9d\xda\x12\xb6\x05\x37\x2c\xe7\xd8\xd3\xc8\xd1\xcd\x71\x81\x34\x25\x27\xe4\x6a\x9c\xa4\x98\xdc\x0f\x13\xa6\x92\x35\x43\x1d\xe7\xff\x4e\x61\xfa\x80\xb3\x13\xeb\x52\x91\x73\x49\xe8\xc9\xeb\xd3\x57\x4f\x6e\xeb\xcd\xb0\xe4\xb5\x42\xe0\xab\x7f\x7e\x09\x04\x56\xfd\xfb\x9f\xbc\x3f\xd9\xac\x51\x6b\x3b\x9b\xff\x8f\x4a\xd5\x61\xc3\xc6\x96\x70\xed\x98\xa1\xde\x16\xb6\x5a\x2a\x67\x62\x57\xd4\x6f\x85\xd8\x72\xd9\x58\x12\x3d\xf1\xc0\x6e\x62\x82\xae\x7d\xed\xe1\xb0\xd5\xba\xb8\x14\xaa\xb8\x37\xf0\xab\x47\x3a\x10\xec\xd2\x38\x24\x4d\xe5\x76\xd2\xed\x48\x24\xd8\x75\x68\x52\x69\xeb\x60\xef\x42\x13\xca\x8a\xe2\xdc\x33\x96\x2a\x23\x66\x10\x3c\xb2\x3c\xd8\x02\xd4\x0e\xba\xf3\x8f\x47\x96\xef\x39\xf2\x68\xe3\x69\x88\xda\xe6\x69\x07\x1d\x4f\x43\xd4\x69\x3c\x27\x8f\xad\x5c\x27\x8f\x35\xdf\xfe\xe4\xf1\x34\xd6\xa3\xc7\xb7\xad\xbc\xed\x78\xcd\x7c\xf4\xf8\xf6\x79\xb9\x3f\x34\x34\x7f\xd8\xa7\x79\xc7\xd9\x11\x3c\x63\x71\x2e\x43\x89\x89\xb1\x7c\xb9\xa3\x8e\xf7\x96\x7b\x6c\x65\xac\x12\xeb\xbd\x7b\x3a\x62\x59\x3a\xe2\x3c\xd5\x59\xd1\x93\x53\x54\x9c\xcc\x83\xb5\x43\xf8\xf2\xbc\xdf\x9d\xed\xfb\x81\x8a\x68\xbb\x27\x09\x6a\xb3\x1a\xfd\x4b\x53\x83\x3c\xbe\xf5\x44\x50\x13\x01\x96\x57\x19\xeb\xc7\xd6\x9d\xfb\xd2\xed\x46\x28\x21\x22\x41\xbe\x75\x10\xbc\x0f\xe3\x4b\x8e\x36\xd9\x12\xfb\xb3\x5e\x15\xd7\xcd\x6f\x82\x16\xd9\x16\xbe\x31\xd3\xc6\x94\xc1\x2c\xe7\xc4\x20\x04\xfe\xba\x3a\x80\xfe\xea\x5a\x26\xf4\x14\x0d\xec\xbc\x5a\x5b\x68\x97\x53\x8e\xea\x98\x9a\xfc\xc6\x5c\x12\xc3\xc4\x24\x38\x00\x45\xb1\xbd\x5d\xd8\x8b\xd7\x07\x9c\xb9\x6d\x3a\x48\x05\xf5\x21\x76\x10\x13\x4a\xf7\xa3\x07\xad\x15\x32\xaa\xa1\xb3\x3a\xfd\x51\xa0\x76\xfe\xac\x46\xd7\x0c\xb1\x0b\x45\xa5\x60\xae\x64\x96\x6f\x5d\x44\x44\xe9\x4f\x71\x14\xa6\x3f\x6d\x0e\xe7\x2d\x17\x22\xfe\xa6\x87\x14\x46\x8e\x65\x52\xe8\xe6\x9d\xcf\x61\x17\x0a\xd1\xa8\x30\x46\x0a\x4f\xa8\x8b\x51\xc6\x4c\xd0\x60\x58\x39\xf9\x3e\x88\x3f\xfe\x33\x0a\xcb\xd9\x3b\xf8\xf8\xf9\x3e\x96\x57\x0b\x4b\xc2\xa5\xc6\x4f\xce\xe0\xd5\xaa\x72\xe9\x66\x75\x70\xdd\x4e\x7b\x8b\x5d\xed\x90\x0a\xdd\xb8\xdd\x0b\x76\xcd\x69\xf7\x40\x23\x94\x9e\xc1\x01\xc7\xa0\xba\x13\x8c\x83\x90\xee\x5a\x0a\x0f\x82\x24\x93\x53\x6c\x87\xe4\xbb\x5e\x0f\xbe\x7c\xbc\xfa\x78\x01\xef\x04\x05\x93\x22\x8c\x48\x72\x0f\xa5\x0a\xbf\xc0\xc5\x39\xf4\x7a\xc7\x07\xf1\xad\x9c\x62\x3b\x8e\x97\xa9\x94\x1a\x41\xe0\x0c\x52\x59\x68\x84\xb1\x54\x30\x97\x85\x72\x89\x79\xa6\xcf\xc3\xb1\xbb\xaa\x3c\xd3\xe7\x17\x25\xe6\xdd\x27\x13\xee\xe6\xa1\xdc\xd1\xb7\xf8\xa1\xe3\x06\x66\x6b\xb8\xe3\x04\x24\x8f\x2f\xcb\xcb\x15\x3e\x07\x41\xa6\x6c\xe2\x56\x26\x90\xe2\x02\xa2\x44\x52\x8c\xa3\xd0\xfd\xf4\xbb\xb4\x7c\x5a\xc6\x95\x08\xfe\x2f\xe7\x5c\xc3\x11\x29\xf2\xb5\x5e\xd4\x86\xc0\x6f\xc8\x73\x1f\x02\x8d\x17\xdb\xe8\xdb\x5e\x48\x1b\x25\xc5\x24\xfe\xf5\xc7\x28\xf4\xff\x42\x0f\x4c\xca\x34\xd8\x5c\xb6\xed\x15\x93\xc2\xb5\x4d\x3b\x88\xdf\x36\x89\xcb\xb3\x4e\x7f\x26\xbb\x93\xee\xea\xfa\xa6\x49\x58\xee\xa5\x7c\x69\x47\x0a\xcc\x60\xa6\xf7\xb0\xb8\xbe\xbb\x6c\xb2\x70\xe5\xb8\xd1\x1c\x10\x41\x43\xa9\xc0\xb9\xc4\x65\x58\x99\x37\x7b\x98\x5e\x7e\xf9\x7c\x03\x7f\x81\xbb\x26\x67\x4d\xa6\x08\x64\x55\xc2\x7c\x8b\xe9\x98\xd6\xf5\x0c\x66\x29\x2a\xb4\x39\x05\x44\xed\xb3\xde\x4b\xb9\xb4\x51\xb3\x26\xc9\x69\x0f\x55\xab\xe2\x44\xea\x66\xd9\x64\xb8\x0f\x95\x2b\x59\x8c\x38\x42\xb2\xc9\xda\xee\xe4\x9b\x46\x54\x7a\xef\xd3\xb4\x43\xc5\x7d\x7c\x7c\xc6\xaf\x75\x70\x1f\xa4\x01\x32\x25\xcc\x7d\x55\x07\x73\x34\x9b\x39\xbc\x3b\x4e\xdf\x71\xb3\x03\x33\x02\x13\x25\x8b\x1c\xe4\xb8\x44\x6d\xaf\x3e\x2d\x6d\xef\x01\x35\xc4\xe6\xd7\xe1\x15\x64\x47\x3f\x38\x96\xd2\xa0\x8a\xef\x50\x4d\x91\xc2\x8c\x99\xd4\x6e\x6d\xdc\x97\x77\x42\x5a\x67\xa1\x02\x21\x15\x8e\x51\x29\xac\xf7\x7b\xa9\x31\xb9\xbe\x08\xc3\x84\x50\x3a\xd7\x96\x56\xf5\x13\x99\xd9\x45\x86\xd2\xb9\xdd\xdd\xb8\xfe\xef\x08\x4e\x13\x66\xd2\x62\x64\x99\x84\x29\x49\x28\x23\xba\x64\xde\x6b\x7c\x81\x14\x6c\x7c\x6c\x43\xe2\x3e\x7c\xc6\x29\xd3\x36\xcf\xca\x4f\x86\xb2\xcc\x5d\x8b\xf4\xed\xfa\xe5\x0c\x7b\xfd\x2a\x0a\xfd\x77\x3e\x51\xe8\xbf\xfd\xfc\x4f\x00\x00\x00\xff\xff\x5c\xcf\xc3\x2e\x15\x2a\x00\x00") func templatesBaseTmplBytes() ([]byte, error) { return bindataRead( @@ -426,7 +426,7 @@ func templatesBaseTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "templates/base.tmpl", size: 10787, mode: os.FileMode(438), modTime: time.Unix(1490471040, 0)} + info := bindataFileInfo{name: "templates/base.tmpl", size: 10773, mode: os.FileMode(438), modTime: time.Unix(1492260775, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/config/commands.go b/config/commands.go index 80eedd60..60c3b881 100644 --- a/config/commands.go +++ b/config/commands.go @@ -36,7 +36,7 @@ func CommandRunner(c *caddy.Controller) (CommandFunc, error) { } fn = func(r *http.Request, c *Config, u *User) error { - path := strings.Replace(r.URL.Path, c.BaseURL+c.WebDavURL, "", 1) + path := strings.Replace(r.URL.Path, c.WebDavURL, "", 1) path = u.Scope + "/" + path path = filepath.Clean(path) diff --git a/config/config.go b/config/config.go index d6124bb1..68795b23 100644 --- a/config/config.go +++ b/config/config.go @@ -31,6 +31,11 @@ func (c Config) AbsoluteURL() string { return c.PrefixURL + c.BaseURL } +// AbsoluteWebdavURL ... +func (c Config) AbsoluteWebdavURL() string { + return c.PrefixURL + c.WebDavURL +} + // Rule is a dissalow/allow rule type Rule struct { Regex bool @@ -88,7 +93,7 @@ func Parse(c *caddy.Controller) ([]Config, error) { cfg.BaseURL = strings.TrimPrefix(cfg.BaseURL, "/") cfg.BaseURL = strings.TrimSuffix(cfg.BaseURL, "/") cfg.BaseURL = "/" + cfg.BaseURL - cfg.WebDavURL = "webdav" + cfg.WebDavURL = "" if cfg.BaseURL == "/" { cfg.BaseURL = "" @@ -234,12 +239,16 @@ func Parse(c *caddy.Controller) ([]Config, error) { } } + if cfg.WebDavURL == "" { + cfg.WebDavURL = "webdav" + } + caddyConf := httpserver.GetConfig(c) cfg.PrefixURL = strings.TrimSuffix(caddyConf.Addr.Path, "/") cfg.WebDavURL = "/" + strings.TrimPrefix(cfg.WebDavURL, "/") cfg.Handler = &webdav.Handler{ - Prefix: cfg.BaseURL + cfg.WebDavURL, + Prefix: cfg.WebDavURL, FileSystem: cfg.FileSystem, LockSystem: webdav.NewMemLS(), } diff --git a/filemanager.go b/filemanager.go index ab508eae..e4325c97 100644 --- a/filemanager.go +++ b/filemanager.go @@ -60,7 +60,7 @@ func (f FileManager) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, err } // Checks if the request URL is for the WebDav server - if httpserver.Path(r.URL.Path).Matches(c.BaseURL + c.WebDavURL) { + if httpserver.Path(r.URL.Path).Matches(c.WebDavURL) { // Checks for user permissions relatively to this PATH if !user.Allowed(strings.TrimPrefix(r.URL.Path, c.WebDavURL)) { return http.StatusForbidden, nil diff --git a/page/version.go b/page/version.go index cb435dec..2c81d95c 100644 --- a/page/version.go +++ b/page/version.go @@ -1,5 +1,5 @@ package page -var GIT_COMMIT_HASH = "37b14d6" +var GIT_COMMIT_HASH = "e46a007" var CIRCLE_BUILD_NUM = "" -var GENERATED int64 = 1492007757358403000 +var GENERATED int64 = 1492261242791293300