From d3ecd22dbaa2005d97b4630b3dd4ad1155500257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=9C=C9=B4=E1=B4=8B=C9=B4=E1=B4=A1=E1=B4=8F=C9=B4?= Date: Sat, 22 Feb 2020 19:12:31 +0800 Subject: [PATCH] cmd: fix unable to find correct custom config --- internal/assets/templates/templates_gen.go | 8 ++++---- internal/cmd/admin.go | 16 ++++++++-------- internal/cmd/backup.go | 2 +- internal/cmd/hook.go | 2 +- internal/cmd/import.go | 2 +- internal/cmd/restore.go | 2 +- internal/cmd/serv.go | 2 +- internal/cmd/web.go | 2 +- internal/conf/conf.go | 11 ++++++----- 9 files changed, 24 insertions(+), 23 deletions(-) diff --git a/internal/assets/templates/templates_gen.go b/internal/assets/templates/templates_gen.go index fad81bdb3..cac52d55f 100644 --- a/internal/assets/templates/templates_gen.go +++ b/internal/assets/templates/templates_gen.go @@ -5,7 +5,7 @@ // ../../../templates/admin/auth/new.tmpl (10.045kB) // ../../../templates/admin/base/page.tmpl (1.227kB) // ../../../templates/admin/base/search.tmpl (247B) -// ../../../templates/admin/config.tmpl (16.782kB) +// ../../../templates/admin/config.tmpl (16.795kB) // ../../../templates/admin/dashboard.tmpl (7.122kB) // ../../../templates/admin/monitor.tmpl (1.87kB) // ../../../templates/admin/navbar.tmpl (1.219kB) @@ -317,7 +317,7 @@ func adminBaseSearchTmpl() (*asset, error) { return a, nil } -var _adminConfigTmpl = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x5c\x4d\x73\xdb\x38\xd2\x3e\x7b\x7e\x05\x5f\xd5\x7b\xd8\x9d\x5a\x53\xb5\x55\x73\xd8\x83\x32\x55\x8a\x12\xdb\xb3\x91\x67\xb4\x92\x32\x73\x44\x41\x44\x8b\xc4\x1a\x04\x38\x00\xa8\x8f\xb8\xfc\xdf\xb7\xf0\x41\x89\x92\x49\x89\x50\xe4\x5d\x9f\x12\x87\xdd\x4f\x3f\x6c\x34\xfa\x03\xa0\xf3\xfc\xac\x21\x2f\x18\xd6\x10\xf5\x16\x58\x41\x3f\x03\x4c\x7a\x51\xfc\xf2\xf2\xc3\x80\xd0\x55\x94\x30\xac\xd4\x87\x1e\x26\x39\xe5\x51\x22\xf8\x92\xa6\xbd\x9f\x7f\xb8\xa9\x3f\x2b\xa9\x79\xa0\x31\xe5\x20\xcd\xb3\xe3\x87\xa9\xa4\xc4\xfe\xfb\x4d\xdd\x98\x45\xec\x73\xbc\x5a\x60\xe9\xec\xdd\x1c\x6a\xea\x35\xb0\x15\x44\x6b\x4a\x20\x4a\x04\x2b\x73\x6b\x5f\x03\xd7\x0e\xec\xe6\x15\x75\xcc\x40\x6a\x87\xe5\x05\xfa\x3f\xde\xcc\x40\xae\x40\x46\x0a\xb4\xa6\x3c\x55\x37\x3f\xf6\x9d\xa9\x9b\x41\xf6\x53\x8d\xa4\x16\x45\x84\xb5\xc6\x49\x06\x24\x32\x3e\xf0\xef\x62\x61\x62\xfa\xf7\x7f\xf0\x78\x2e\x3d\xeb\xd8\xf9\x21\x56\x16\x1a\x79\xaf\x54\xb0\xfd\xec\x27\xa7\x78\xe4\x86\x1d\xba\xc6\x0b\x06\x91\x82\x34\xdf\xbf\xcb\xcd\x80\xb0\x4a\x96\xb0\xdb\x4c\x48\xfa\xcd\xf8\x94\x45\xd6\xe2\xed\xc1\xbf\x55\x3a\x37\x03\xa2\x7f\x6e\x65\xb7\x90\x98\x13\xc4\x71\x0e\xbd\x97\x97\x41\x9f\xe8\xbd\x16\x31\x5a\xc3\xa2\x88\x3f\x1a\x99\x5f\x71\x0e\x56\x82\x74\xc2\x95\x25\x47\xa5\x02\xd9\x8e\x3a\x2d\xf9\x57\x05\x32\x10\x33\x17\xe4\x04\xd3\x69\xc9\x1f\x05\xd9\xf1\xdc\x09\x1c\xb8\x98\xd0\x15\xb5\x0b\x37\xe8\x13\xba\xaa\x49\x9d\x30\xed\x16\x31\x86\x8d\x06\xc9\x31\x43\xa5\x64\xcd\x2c\x5c\x20\xc5\x9f\xbd\xe0\xd7\xe9\x38\xe0\x05\xbd\x15\x22\x72\x4c\xf9\x49\xfc\x4f\x56\x24\x1c\xba\x90\x42\x8b\x44\x9c\x26\x3f\xf1\x42\xe1\xf0\x99\xd6\x05\xc2\x84\xb4\x2c\xbb\xc7\x7f\x98\xcf\x27\x43\x42\x42\x96\xbe\x8e\x5f\x08\xa9\xcf\xe2\x4f\x84\xd4\xe1\xf8\x09\x48\x8d\x96\x94\x35\x85\xd8\x20\x11\x04\x6a\x56\x46\x20\xf5\x1d\x65\x36\xd8\xec\xa3\x50\x63\x4f\xb0\xed\x6a\xeb\x0b\x6c\xbf\xcb\x94\x66\x0a\xe5\x94\xa3\x15\x48\x45\xc5\xe9\xd0\x9a\x8f\x67\x8f\x94\xff\xee\x24\xc3\x5d\x58\x72\xba\x41\x4a\x24\x4f\xa0\x51\x01\x32\xa7\xaa\xc5\xe2\xf1\x3b\x7e\xe5\x74\x33\xb3\x7a\x93\x9d\xda\xc5\x2f\xcc\x44\x82\x19\x92\x42\xe8\xb3\x5b\x75\x6c\x44\xa7\x42\xe8\xda\x5e\xbd\x7a\xe2\x10\xcb\x25\xa3\x1c\xda\xd2\xd7\x80\x56\x66\x96\x38\x5a\xe2\xe7\x67\xba\x8c\x2a\x7e\xbf\x39\x55\x97\xd7\x6e\x93\x0c\x92\xa7\xe7\x67\xe0\xe4\xe5\xe5\x56\xfd\x59\x62\x09\xb7\xc2\x30\xa2\xc1\x3e\x22\x54\x99\x1a\x83\xa4\x28\x35\x48\xc4\x44\x1a\xc8\xec\x93\x03\x98\x5a\xfd\xb1\x48\xaf\x4b\x0f\xb8\x65\x97\x7e\xa3\x45\x20\xaf\xcf\x56\xf3\xfe\x1b\x2d\xba\x30\xba\xfa\x5a\xe3\xa2\x40\x04\x6b\x8c\x0a\xac\xb3\x0e\x81\x3f\x2c\x8a\x4f\x58\xe3\x09\xd6\xd9\x77\xc4\x3b\x26\x08\x2b\x05\x5a\xa1\xa5\x14\x39\x22\x54\x3d\x05\xba\x6d\x2c\x30\x19\x5a\x88\x3b\x29\xf2\x4f\x54\x3d\xfd\x4f\xdc\xc7\x30\x27\x94\xa7\x2d\xfb\xf6\xd8\x79\x63\x27\xed\xf7\x6e\xcd\x77\xd7\xe3\xc5\x44\x6a\xf3\xb4\x4b\x27\xe7\x16\x75\x2c\x52\x93\x4c\x2e\x5b\x4d\x09\x26\x43\x03\xc2\xa5\xce\xda\xda\xa7\x9d\xa5\xa9\x13\x9e\x48\xb1\xd9\x0e\x4b\x9d\x55\xdd\xd4\xb1\xc9\x41\x9f\x30\xdf\x6b\xd6\x5e\xda\xb5\xbd\xb3\x87\xb7\xe9\x79\x55\xf6\x5e\x1b\x5e\xa5\x32\x9f\x5a\x48\xc7\xfd\xc1\x85\x8e\xe2\xd9\xec\xa1\xca\x77\xa4\x7b\x9e\x6b\xd3\xf7\x8f\xcf\x33\x6d\x6c\x05\x77\x05\xcc\x60\x36\x34\x82\xe7\x61\x1b\x5a\xa8\x3a\xe8\xeb\xe6\xe9\x3c\x64\xdb\xe6\x38\xda\xb5\xb3\x87\xf8\xe4\xf6\x38\x6f\xe8\x09\xb6\x29\xf0\x6e\xa6\xbe\x58\xd9\xef\x33\x86\x34\xa8\x8e\x6f\xf6\x05\xb6\x73\x50\xdf\xf3\x72\x39\xe5\x34\x2f\x73\x64\xec\x2a\xfa\x0d\x90\x0d\xb4\x46\xc3\x8d\x99\x7c\xf6\x10\x3f\x3a\x88\x2f\xb0\x9d\xd1\x6f\x30\x32\xfa\xdd\x03\x36\x9c\xa1\x3a\xeb\x95\x43\x42\xea\x42\xcf\x48\x58\x4b\xaa\x5d\x6a\x34\x5b\x1e\x88\xa1\xa0\x10\xd6\x48\x69\xdc\x1c\xce\xad\x3e\x9a\x3a\xb0\xe1\x0e\xeb\x0b\x6c\xd5\x50\xcf\x0c\x50\x40\xd1\xeb\x58\x5d\xce\xbf\x9c\x7d\x03\xb4\x28\x29\xd3\x94\x23\x57\x08\x83\x5e\xc8\x32\xff\xe8\xf4\x5d\x65\xbc\xe6\x9a\x33\xaa\x34\x70\x94\x09\x75\x2a\x6b\x8c\xad\xd4\x83\x50\xc1\xb9\xc3\xe3\x9f\xc9\x4a\x0e\xff\x92\xdc\x54\x1d\xc1\xd0\x22\x03\x79\x3e\x60\x9d\x03\x47\x4e\xba\x31\x5c\xbd\x53\xcf\xd6\xd7\x29\x14\x42\x51\x2d\xe4\xf6\x4d\xca\xac\x84\x42\xbc\xd7\x3a\x6b\xb8\xb5\x16\x85\xa3\x3e\xa6\x72\x92\x2d\x0d\x97\x74\x4d\x85\x88\x55\x22\x69\xa1\x91\xde\x16\x27\x07\xea\x9a\xb1\x99\xd5\x98\x6f\x8b\x0b\xe6\x6a\x6b\x12\x73\x45\x51\x92\x61\xad\xa0\xf9\x40\xc2\xec\xce\x9a\xc1\xe1\xaf\xb3\x5f\x46\x19\x96\x0a\xf4\xcb\xcb\x21\x97\x21\x57\xb4\xf6\x08\x98\x02\x2b\xd2\x6c\x9d\x0b\x8d\x9c\x4d\x1f\x88\x61\xbc\x97\x42\x26\x80\x0a\x49\x57\x58\x77\x9e\x46\x6b\x64\xef\x8c\xfe\xc4\xa9\x5f\x69\xe6\xb3\xbc\x72\xbc\x41\x89\x04\xac\xa9\xe0\x88\xd1\x9c\xb6\x1c\xf3\xd4\xa8\x3c\xe2\xcd\xc8\x6b\x8c\x8d\x42\xa8\x2b\x0a\x09\x4b\x90\x12\x08\x62\x34\x01\xae\x5e\x95\x33\x67\xf2\x9f\x82\xf2\x03\x17\x4c\x2a\xbd\xb1\x57\x8b\x7a\x7f\x8b\x7a\xa1\xd6\xab\x09\xdc\x1e\x6b\xa5\x8d\xaf\x7b\x6e\x2d\x7c\x4f\xf9\x30\x9f\x4f\xee\x69\xa7\xda\xd5\x95\x9c\x9f\xbf\xdd\x49\x8a\xd9\xc3\x28\xa7\xa9\xb4\xae\xbe\x80\xa7\x9b\xc9\xed\x59\x8b\x69\x8f\x1e\x2b\xa8\x37\x60\x2c\xf1\xda\xcf\x6b\xc0\x09\xc8\xa0\x33\x97\x57\x8c\xa7\x78\x7d\x47\x19\x4c\x2d\xd4\x15\xcf\x60\x2c\xe1\x44\xe4\x39\x35\x13\x3b\xe8\xc4\x0e\x4c\x49\x29\x25\xf0\x64\x7b\x36\xee\x47\x4e\xf3\xce\x28\x8e\xf6\x7a\xd7\x3f\xbf\x72\x8e\x25\xc6\x6a\x6c\x4f\xb0\xd6\x12\x17\x08\x36\x1a\xb8\xa2\x82\x37\x6d\x97\xa6\x5c\xfb\xd9\x21\x8c\x29\x87\x3f\x24\x2e\x3e\xef\xf4\x2f\x4c\xbd\x9e\x51\x21\x61\x45\x61\x6d\x97\xdd\x2e\xb9\x59\xeb\x40\x4e\x93\x3d\x86\x59\x69\xb3\xc6\xc7\xac\xae\xec\xce\xb2\x60\x02\x93\xc0\x29\xb4\xce\xfc\xab\x03\x70\x11\x1a\x30\x8e\x76\xa6\xa6\x21\x2f\x42\xea\xb6\x27\x34\x87\xbc\xb8\xf4\xe0\x63\x6f\x1c\x33\x26\xd6\x40\x6c\x29\xef\xba\x96\x9e\xc0\xd0\xa9\x9a\x9a\x7e\x69\x64\x79\x12\x2e\x9a\xf0\xc6\xce\x38\x67\xb7\xa3\x37\x6f\xe3\x07\x6f\xcc\x98\xf3\xf2\x12\x3d\x7e\xbc\xc8\xb2\x31\x6a\xac\x37\x57\xa2\x06\xab\x8f\x78\x63\x0c\xab\x83\xea\x73\xa2\x29\xfd\x84\x35\x5e\x60\x05\x6f\xd2\x92\x92\xc5\x7b\x6d\x48\xc9\x22\x6e\x69\x0e\x9f\x9f\xe3\xca\x27\x71\xd5\x0e\x76\x5c\x38\xb2\x88\x1b\xa6\xa2\x63\xd0\xd7\x33\xd1\x39\xd0\xf6\x0b\xd9\x1d\x68\xe0\x85\x2c\x59\xc4\xed\xf7\xb1\x3b\xd0\xc0\x1b\x59\xb2\x88\x95\x62\x27\x2e\x65\x77\xc0\xb3\xd9\xd8\x55\xcf\xa8\x0b\x18\xca\x80\x15\x15\xd9\xce\x54\x5a\x12\x56\x9d\x86\xcb\x4e\x27\x39\xd8\x56\xa7\xc9\x7e\xf3\x96\x1a\xfc\xdf\xed\x6d\x64\xda\xaf\x68\x64\x21\x4a\xd7\xd7\x44\xb7\xb7\x3f\x5f\x69\x4b\xd9\xee\xf0\x9d\x6e\x2a\x77\xe1\x9b\x24\xa0\x94\xa1\xa8\xa5\x60\xc8\xe6\x6f\x24\x24\x4d\x1b\x2f\xb1\xab\xb1\xdb\x55\x35\xe3\xb9\x78\x68\x01\x46\x4e\xdf\xe6\xf0\xdf\xac\xf6\xfe\xa0\xf4\x66\x97\xf4\xcf\x28\xf8\x9c\xbf\x37\xe2\x46\xa9\x3d\x0e\x6d\x7f\x99\xfd\x58\x65\x0a\x67\x0d\x62\x3f\xeb\xdf\x9c\x8f\x87\xab\x7c\x30\x42\x13\x78\xaf\x4b\x2e\x21\xa5\x4a\x83\x44\x90\x63\xca\x1c\x4b\x99\x87\xdc\x35\xd1\x04\xe2\xa9\x47\xf9\x6c\x40\x46\x0e\xe3\x4a\x8d\xcc\xee\x5e\xd3\x9b\x08\xa5\x56\x5d\x6b\x5a\xf5\xab\x4e\x29\x2a\x13\x6b\x4f\xcb\xe1\xa2\x45\xa9\x75\xf7\x79\xaa\x62\x38\xcb\xc4\xba\x4e\xef\xa3\x45\xb9\x5a\x1f\xf8\x67\x49\x25\x20\x45\x53\x8e\x28\x47\xa6\x39\x0e\x5f\x5d\x8b\x31\xa3\x29\xff\x85\xff\x4e\x61\x7d\x25\x6e\x36\xe2\xb8\xd0\x74\xd9\x34\x22\x9d\xa4\xe4\x9a\xe5\x5f\xad\xee\x23\xa6\x2c\xe4\x12\xa7\xff\x63\xa7\x80\x3b\x79\x68\xdf\x35\xec\x2e\x3b\xbe\xdf\x75\x70\x67\x1c\xe8\x47\xe4\x04\x17\x3a\xc9\xf0\x65\x3e\x1c\x39\xe5\x90\x25\x3d\x39\x37\x75\xa0\x8d\x13\x4d\x57\x26\x23\x12\x40\x8c\xae\xda\x7a\xe3\x8a\xe7\xd0\x8a\x8f\x04\x81\xb1\x11\x3e\x2a\xf8\x5a\x08\x16\x4b\xbc\x46\x39\xe5\xa5\xae\xb0\xba\x6e\x0e\x05\x1a\x15\x58\xa9\xb5\x90\xa4\x33\xa1\xa9\x51\x9b\xac\xc9\x65\x94\xde\xaa\xd0\xac\x61\x91\x09\xf1\xf4\x5e\x0b\xcd\x9f\x25\x94\x80\x18\xf0\xb4\xad\xad\xfb\xc3\xbd\x40\xfc\x2f\x23\x39\xb6\x82\x21\x1d\x23\x98\x95\x93\x48\xd3\x1c\x44\xd9\xd2\xc3\x57\x26\x3e\x39\xe1\xb9\x93\x6d\x5b\x3e\x05\x89\xe0\x24\x28\xa2\xd4\x13\x2d\x90\x66\x0a\xad\x40\x06\xa4\xb5\x8a\xd7\xec\x89\x16\xf3\xf1\xec\x77\xab\xdc\x79\x4b\xbe\x55\x44\x99\xfc\xfc\x7e\xbf\x75\xf5\xec\x02\xcf\x5d\x1e\xad\x56\xf0\x59\x4b\xa3\x72\xd5\x53\x76\xa1\xa9\xca\xc5\xbf\x21\xd1\xa8\x90\xb0\xa4\x9b\x93\x97\x56\xce\x4a\x3c\x73\x1a\x13\xab\x70\xc1\x35\xab\x37\xbc\x3b\x95\x06\x26\x3a\x5f\x42\x7a\x0a\xd5\x71\x34\x30\x71\xad\x0b\x48\xcf\xea\xc4\xe5\xa3\xb7\x1d\x7a\xf3\xe8\x81\x1b\xa6\xe2\xda\xf5\x8d\xc7\x76\x73\xf1\xde\x56\xf5\xb3\x9b\x2e\xfe\x02\x79\xa1\xb7\x7f\xad\x5f\xc6\x0c\x16\x72\x8f\xb6\x14\x32\xaf\xc5\xbd\xf9\xb1\x17\x99\x9a\x26\xf8\x87\xde\xf3\xf3\xb0\x28\x66\xe5\xc2\x7e\xc2\xd4\x77\x1f\xbc\x3b\x86\x7d\xfb\xe5\x81\xa1\xd9\x8b\x72\xd0\x99\x20\x1f\x7a\x85\x71\xc3\x0e\xd9\xec\xc4\xd1\x6c\x7a\x37\x17\x4f\xc0\x1f\xe6\x8f\xe3\xfa\xa4\x53\xdb\x6c\x94\x33\xca\x21\x5a\x52\x60\x24\x2a\x69\xc4\x60\x59\x47\x39\xde\x98\x94\x17\xe5\xc1\xf3\x9b\x81\xfd\xa7\x48\x6f\x0b\xf8\xd0\x03\x47\x89\xe3\x7c\xff\x83\xef\x1a\x49\x1d\xb4\x5e\xde\x5f\xff\xe8\x5a\xdf\x83\xdf\x00\x00\xe0\x91\xef\x88\x23\x4a\x3e\xf4\xcc\xfb\xdf\x1a\xfc\xdb\x85\xe6\xbd\x53\x5f\x8e\x71\x82\xf6\xce\x32\x4b\xe0\x60\xf6\x4b\xd0\x37\x4e\x0f\xb8\xbe\xfd\xfe\x5c\x98\x18\xe9\xf7\x9a\x0a\x1d\x39\x4c\x70\xd1\x3c\x20\x99\xb8\x32\x22\x43\x27\x11\x50\xcf\x1c\x32\xe5\x1a\xe4\x0a\xb7\x7c\x79\x6b\xa1\x7f\xf1\x22\x61\xb5\xd4\xed\x4a\x0b\x30\x12\x9c\x77\xeb\x7a\x77\x4b\x71\xf2\x3b\xe4\x1a\xe8\x65\x57\xfe\xd7\x18\xfd\xed\x67\xcf\xef\x35\x6a\x2a\x7a\x85\x14\xae\x85\x6f\x69\x7a\xad\x94\x3b\x0e\x8b\x27\x5e\x36\x20\x84\x2a\xf8\xbd\x1b\x4e\x7c\x05\xda\x64\xcb\xfd\x18\x7e\x01\x90\x08\xf1\x44\xe1\xc4\x6f\xc3\x1c\x9a\x1b\x59\xf1\xc0\x73\xd8\x34\xd9\x6d\x0e\xdb\x79\x76\x31\x74\x9f\x30\xba\x04\x23\x7d\xcd\xc6\xd3\x2f\xa6\x81\xee\xcc\xe4\x11\x6f\xde\x80\x4a\xa6\x75\xa1\x90\xe0\x2c\x60\xaa\xaf\xb3\x9a\x41\x52\xca\x6b\xdd\xcc\xfa\x20\x08\x72\x8b\x8b\x84\x31\x5d\xc2\x3c\xd4\x33\x6f\x95\x4a\x0a\x9a\xe8\x52\xbe\xdb\x02\x54\x35\x99\xa9\xc4\x2b\xac\x71\xe7\x43\x3a\xdf\x60\xde\x7b\xb5\xff\xe6\x21\x84\x3f\x3b\x59\x02\x01\x89\x35\x10\x14\xc6\xdc\x0d\x01\x77\x95\xf6\x30\x8c\xff\x5b\x85\x49\x4a\xf5\x7b\x0d\x11\x43\xad\x0a\x13\x42\x97\x4b\x94\xd1\x34\x63\x34\xcd\x3a\x7f\x27\x73\x4f\x75\x15\x30\x9f\xe8\x72\xf9\x50\xe9\x5f\x29\x53\x18\x82\x39\xde\x38\x72\xa6\xc1\x6e\x39\x05\x32\x34\x1e\xf1\xe6\x9e\x6a\xc3\x62\x6c\x04\x43\x0a\xc6\xb1\x15\x94\x64\x58\xe2\x44\xbf\xfe\x94\xb1\xd5\xde\x68\xa7\x71\xa9\xe1\x13\x37\xd2\x87\xe6\x5e\x5f\x45\x9f\xb7\x92\x26\x08\xcb\xf4\xe4\x5d\xbf\x31\x72\x3f\x1a\xca\xb4\xed\x5e\xff\x7b\x77\xb7\x7d\x5b\xfb\x55\x12\x9c\x3e\x11\x32\x4c\xfc\x31\x50\xec\x3e\x63\xba\x66\x29\x74\x34\xa4\x14\x67\xce\xa5\x0e\x59\x18\xf9\x2b\x93\x48\x98\xe0\x01\x9e\x18\x19\xf1\x2b\x53\x28\x4a\xc6\xba\x33\x98\x94\x2c\x70\x96\xe8\x12\x97\x9d\xcd\xdf\x8f\xde\x45\xd9\x67\x22\x0d\xce\xe7\x4c\xa4\xb7\x4e\xe7\x55\x52\x77\xa9\x7e\xaf\xb3\x02\xb9\x8d\x16\x58\xd1\xc4\x55\x81\xde\x7e\x3c\x92\x98\xa7\x10\xc5\x63\x91\xa6\x36\xcf\xec\x46\x6f\x2d\x6b\x53\xbf\x36\x8e\xfb\xff\x13\xe4\x77\xdf\x12\x68\x72\xac\x16\x57\xbf\xdb\x5d\x7b\x54\x47\x1f\xf4\xc3\x4c\x89\x42\xef\x3e\x61\x3b\xb6\x36\x28\x24\xd4\x46\xc3\xe3\x81\xc2\x3e\x3d\xe0\x51\xb3\x7d\x34\x2a\x5a\x47\x1d\xac\x75\xfd\x6f\xd5\x5f\xfc\x9f\xfe\x8f\x57\xff\x6b\xc1\x52\x08\x33\xa9\xdb\xff\xb6\xe0\x3f\x01\x00\x00\xff\xff\x45\x29\x49\x5e\x8e\x41\x00\x00" +var _adminConfigTmpl = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x5c\x5d\x73\xea\x38\xd2\xbe\xce\xfc\x0a\xbf\xd4\x7b\xb1\x3b\xb5\x31\xb5\x55\x73\xb1\x17\x9c\xa9\xe2\x90\x93\x64\xf6\x90\x19\x16\x38\x33\x97\x2a\x61\x35\xb6\x36\xb2\xe4\x91\x64\x3e\x4e\x2a\xff\x7d\x4b\x1f\x06\x43\x0c\x58\x84\xec\x72\x95\x10\x77\x3f\xfd\xb8\xd5\x6a\x75\x4b\x22\x2f\x2f\x1a\xf2\x82\x61\x0d\x51\x67\x86\x15\x74\x33\xc0\xa4\x13\xc5\xaf\xaf\x3f\xf4\x08\x5d\x44\x09\xc3\x4a\x7d\xea\x60\x92\x53\x1e\x25\x82\xcf\x69\xda\xf9\xf9\x87\x9b\xfa\xb3\x92\x9a\x07\x1a\x53\x0e\xd2\x3c\xdb\x7f\x98\x4a\x4a\xec\xdf\x6f\xea\xc6\x2c\x62\x97\xe3\xc5\x0c\x4b\x67\xef\x66\x57\x53\x2f\x81\x2d\x20\x5a\x52\x02\x51\x22\x58\x99\x5b\xfb\x1a\xb8\x76\x60\x37\x6f\xa8\x63\x06\x52\x3b\x2c\x2f\xd0\xfd\x31\x9a\x80\x5c\x80\x8c\x14\x68\x4d\x79\xaa\xa2\x1f\xbb\xce\xd4\x4d\x2f\xfb\xa9\x46\x52\x8b\x22\xc2\x5a\xe3\x24\x03\x12\x19\x1f\xf8\x77\xb1\x30\x31\xfd\xfb\x3f\x78\x3c\x95\x9e\x75\xec\xfc\x10\x2b\x0b\x8d\xbc\x57\x2a\xd8\x6e\xf6\x93\x53\xdc\x73\xc3\x06\x5d\xe3\x19\x83\x48\x41\x9a\x6f\xdf\xe5\xa6\x47\x58\x25\x4b\xd8\x6d\x26\x24\xfd\x6e\x7c\xca\x22\x6b\xf1\x76\xe7\x6f\x95\xce\x4d\x8f\xe8\x9f\x0f\xb2\x9b\x49\xcc\x09\xe2\x38\x87\xce\xeb\x6b\xaf\x4b\xf4\x56\x8b\x18\xad\x7e\x51\xc4\x9f\x8d\xcc\xaf\x38\x07\x2b\x41\x5a\xe1\xca\x92\xa3\x52\x81\x3c\x8c\x3a\x2e\xf9\x37\x05\x32\x10\x33\x17\xe4\x08\xd3\x71\xc9\x9f\x04\xd9\xf0\xdc\x08\xec\xb8\x98\xd0\x05\xb5\x03\xd7\xeb\x12\xba\xa8\x49\x1d\x31\xed\x06\x31\x86\x95\x06\xc9\x31\x43\xa5\x64\xcd\x2c\x5c\x20\xc5\x5f\xbc\xe0\xb7\xf1\x30\xe0\x05\xbd\x15\x22\x72\x4c\xf9\x51\xfc\x3b\x2b\x12\x0e\x5d\x48\xa1\x45\x22\x8e\x93\x1f\x79\xa1\x70\xf8\x4c\xeb\x02\x61\x42\x0e\x0c\xbb\xc7\x7f\x9c\x4e\x47\x7d\x42\x42\x86\xbe\x8e\x5f\x08\xa9\x4f\xe2\x8f\x84\xd4\xe1\xf8\x09\x48\x8d\xe6\x94\x35\x85\x58\x2f\x11\x04\x6a\x56\x06\x20\xf5\x3d\x65\x36\xd8\xec\xa3\x50\x63\xcf\xb0\x6e\x6b\xeb\x2b\xac\xdf\x65\x4a\x33\x85\x72\xca\xd1\x02\xa4\xa2\xe2\x78\x68\x4d\x87\x93\x27\xca\x7f\x77\x92\xe1\x2e\x2c\x39\x5d\x21\x25\x92\x67\xd0\xa8\x00\x99\x53\x75\xc0\xe2\xfe\x3b\x7e\xe3\x74\x35\xb1\x7a\xa3\x8d\xda\xd9\x2f\xcc\x44\x82\x19\x92\x42\xe8\x93\x53\x75\x68\x44\xc7\x42\xe8\xda\x5c\xbd\x78\xe2\x10\xf3\x39\xa3\x1c\x0e\xa5\xaf\x1e\xad\xcc\xcc\x71\x34\xc7\x2f\x2f\x74\x1e\x55\xfc\x7e\x73\xaa\x2e\xaf\xdd\x26\x19\x24\xcf\x2f\x2f\xc0\xc9\xeb\xeb\xad\xfa\xb3\xc4\x12\x6e\x85\x61\x44\x83\x7d\x44\xa8\x32\x6b\x0c\x92\xa2\xd4\x20\x11\x13\x69\x20\xb3\x3b\x07\x30\xb6\xfa\x43\x91\x5e\x96\x1e\x70\xcb\x2e\xfd\x4e\x8b\x40\x5e\x5f\xac\xe6\xc3\x77\x5a\xb4\x61\x74\xf1\xb1\xc6\x45\x81\x08\xd6\x18\x15\x58\x67\x2d\x02\xbf\x5f\x14\x77\x58\xe3\x11\xd6\xd9\x3b\xe2\x1d\x13\x84\x95\x02\xad\xd0\x5c\x8a\x1c\x11\xaa\x9e\x03\xdd\x36\x14\x98\xf4\x2d\xc4\xbd\x14\xf9\x1d\x55\xcf\xff\x13\xf7\x31\xcc\x09\xe5\xe9\x81\x79\xbb\xef\xbc\xa1\x93\xf6\x73\xb7\xe6\xbb\xcb\xf1\x62\x22\xb5\x79\xda\xa5\x93\x53\x83\x3a\x14\xa9\x49\x26\xe7\x8d\xa6\x04\x93\xa1\x01\xe1\x52\x67\x87\xca\xa7\x8d\xa5\xb1\x13\x1e\x49\xb1\x5a\xf7\x4b\x9d\x55\xd5\xd4\xbe\xc9\x5e\x97\x30\x5f\x6b\xd6\x5e\xda\x95\xbd\x93\xc7\x8f\xa9\x79\x55\x76\xad\x05\xaf\x52\x99\x4f\x2d\xa4\xe5\xfc\xe0\x42\x47\xf1\x64\xf2\x58\xe5\x3b\xd2\x3e\xcf\x1d\xd2\xf7\x8f\x4f\x33\x6d\x2c\x05\x37\x0b\x98\xc1\x6c\x28\x04\x4f\xc3\x36\x94\x50\x75\xd0\xb7\xc5\xd3\x69\xc8\x43\x93\x63\x6f\xd6\x4e\x1e\xe3\xa3\xd3\xe3\xb4\xa1\x67\x58\xa7\xc0\xdb\x99\xfa\x6a\x65\xdf\x67\x0c\x69\x50\x2d\xdf\xec\x2b\xac\xa7\xa0\xde\xf3\x72\x39\xe5\x34\x2f\x73\x64\xec\x2a\xfa\x1d\x90\x0d\xb4\x46\xc3\x8d\x99\x7c\xf2\x18\x3f\x39\x88\xaf\xb0\x9e\xd0\xef\x30\x30\xfa\xed\x03\x36\x9c\xa1\x3a\xe9\x95\x5d\x42\xea\x4c\xcf\x48\x58\x4a\xaa\x5d\x6a\x34\x53\x1e\x88\xa1\xa0\x10\xd6\x48\x69\xdc\x1c\xce\x07\x7d\x34\x76\x60\xfd\x0d\xd6\x57\x58\xab\xbe\x9e\x18\xa0\x80\x45\xaf\xe5\xea\x72\xfa\xe5\xec\x1b\xa0\x59\x49\x99\xa6\x1c\xb9\x85\x30\xe8\x85\x2c\xf3\xcf\x4e\xdf\xad\x8c\x97\x1c\x73\x46\x95\x06\x8e\x32\xa1\x8e\x65\x8d\xa1\x95\x7a\x14\x2a\x38\x77\x78\xfc\x13\x59\xc9\xe1\x9f\x93\x9b\xaa\x2d\x18\x5a\x64\x20\x4f\x07\xac\x73\xe0\xc0\x49\x37\x86\xab\x77\xea\xc9\xf5\x75\x0c\x85\x50\x54\x0b\xb9\xfe\x90\x65\x56\x42\x21\xae\x75\x9d\x35\xdc\x0e\x2e\x0a\x7b\x75\x4c\xe5\x24\xbb\x34\x9c\x53\x35\x15\x22\x56\x89\xa4\x85\x46\x7a\x5d\x1c\x6d\xa8\x6b\xc6\x26\x56\x63\xba\x2e\xce\xe8\xab\xad\x49\xcc\x15\x45\x49\x86\xb5\x82\xe6\x0d\x09\x33\x3b\x6b\x06\xfb\xbf\x4e\x7e\x19\x64\x58\x2a\xd0\xaf\xaf\xbb\x5c\xfa\x5c\xd1\xda\x23\x60\x0a\xac\x48\xb3\x75\x2e\x34\x72\x36\x7d\x20\x86\xf1\x9e\x0b\x99\x00\x2a\x24\x5d\x60\xdd\xba\x1b\xad\x91\xbd\x37\xfa\x23\xa7\x7e\xa1\x9e\xcf\xf2\xca\xf1\x0a\x25\x12\xb0\xa6\x82\x23\x46\x73\x7a\x60\x9b\xa7\x46\xe5\x09\xaf\x06\x5e\x63\x68\x14\x42\x5d\x51\x48\x98\x83\x94\x40\x10\xa3\x09\x70\xf5\x66\x39\x73\x26\xff\x29\x28\xdf\x71\xc1\xa8\xd2\x1b\x7a\xb5\xa8\xf3\xb7\xa8\x13\x6a\xbd\xea\xc0\xed\xb6\x56\xda\xf8\xba\xa7\xc6\xc2\xd7\x94\x8f\xd3\xe9\xe8\x81\xb6\x5a\xbb\xda\x92\xf3\xfd\xb7\xdb\x49\x31\x73\x18\xe5\x34\x95\xd6\xd5\x67\xf0\x74\x3d\xb9\xdd\x6b\x31\xe5\xd1\x53\x05\xf5\x01\x8c\x25\x5e\xfa\x7e\x0d\x38\x01\x19\xb4\xe7\xf2\x86\xf1\x18\x2f\xef\x29\x83\xb1\x85\xba\xe0\x1e\x8c\x25\x9c\x88\x3c\xa7\xa6\x63\x07\x9d\xd8\x86\x29\x29\xa5\x04\x9e\xac\x4f\xc6\xfd\xc0\x69\xde\x1b\xc5\xc1\x56\xef\xf2\xfb\x57\xce\xb1\xc4\x58\x8d\xed\x0e\xd6\x52\xe2\x02\xc1\x4a\x03\x57\x54\xf0\xa6\xe9\xd2\x94\x6b\xbf\x38\x84\x21\xe5\xf0\x87\xc4\xc5\x97\x8d\xfe\x99\xa9\xd7\x33\x2a\x24\x2c\x28\x2c\xed\xb0\xdb\x21\x37\x63\x1d\xc8\x69\xb4\xc5\x30\x23\x6d\xc6\x78\x9f\xd5\x85\xdd\x59\x16\x4c\x60\x12\xd8\x85\xd6\x99\x7f\x73\x00\x2e\x42\x03\xda\xd1\xd6\xd4\x34\xe4\x45\xc8\xba\xed\x09\x4d\x21\x2f\xce\xdd\xf8\xd8\x1a\xc7\x8c\x89\x25\x10\xbb\x94\xb7\x1d\x4b\x4f\xa0\xef\x54\xcd\x9a\x7e\x6e\x64\x79\x12\x2e\x9a\xf0\xca\xf6\x38\x27\xa7\xa3\x37\x6f\xe3\x07\xaf\x4c\x9b\xf3\xfa\x1a\x3d\x7d\x3e\xcb\xb2\x31\x6a\xac\x37\xaf\x44\x0d\x56\x9f\xf0\xca\x18\x56\x3b\xab\xcf\x91\xa2\xf4\x0e\x6b\x3c\xc3\x0a\x3e\xa4\x24\x25\xb3\x6b\x2d\x48\xc9\x2c\x3e\x50\x1c\xbe\xbc\xc4\x95\x4f\xe2\xaa\x1c\x6c\x39\x70\x64\x16\x37\x74\x45\xfb\xa0\x6f\x7b\xa2\x53\xa0\x87\x0f\x64\x37\xa0\x81\x07\xb2\x64\x16\x1f\x3e\x8f\xdd\x80\x06\x9e\xc8\x92\x59\xac\x14\x3b\x72\x28\xbb\x01\x9e\x4c\x86\x6e\xf5\x8c\xda\x80\xa1\x0c\x58\x51\x91\x6d\x4d\xe5\x54\xc2\xda\x90\xd9\xc9\x51\x47\x09\xd9\xba\xa7\x89\x4c\xf3\xfc\xea\xfd\xdf\xed\x6d\x64\x6a\xb1\x68\x60\x21\x4a\x57\xe4\x44\xb7\xb7\x3f\x5f\x68\x7e\xd9\x52\xf1\x4a\x67\x98\x3b\xfd\x4d\x12\x50\xca\x50\xd4\x52\x30\x64\x93\x39\x12\x92\xa6\x8d\x27\xda\x55\x0f\xee\x96\x38\xe3\xb9\xb8\x6f\x01\x06\x4e\xdf\x26\xf4\xdf\xac\xf6\x76\xd7\xf4\x66\x33\xa2\x27\x14\xfc\x08\x6f\x8d\xb8\xbe\x6a\x8b\x43\x0f\xbf\xcc\xb6\xc7\x32\xab\x68\x0d\x62\xdb\xf8\xdf\x9c\x8e\x87\x8b\xdc\x1e\xa1\x09\x5c\xeb\x90\x4b\x48\xa9\xd2\x20\x11\xe4\x98\x32\xc7\x52\xe6\x21\x07\x4f\x34\x81\x78\xec\x51\xbe\x18\x90\x81\xc3\xb8\x50\x55\xb3\x39\xe4\xf4\x26\x42\xa9\x55\x67\x9c\x56\xfd\xa2\x2d\x8b\xca\xc4\xd2\xd3\x72\xb8\x68\x56\x6a\xdd\xbe\xb9\xaa\x18\x4e\x32\xb1\xac\xd3\xfb\x6c\x51\x2e\x56\x14\xfe\x59\x52\x09\x48\xd1\x94\x23\xca\x91\xa9\x94\xc3\x47\xd7\x62\x4c\x68\xca\x7f\xe1\xbf\x53\x58\x5e\x88\x9b\x8d\x38\x2e\x34\x9d\x37\xf5\x4b\x47\x29\xb9\xca\xf9\x57\xab\xfb\x84\x29\x0b\x39\xd1\xe9\xfe\xd8\x2a\xe0\x8e\xee\xe0\xb7\x0d\xbb\xf3\xf6\xf2\x37\xe5\xdc\x09\x07\xfa\x7e\x39\xc1\x85\x4e\x32\x7c\x9e\x0f\x07\x4e\x39\x64\x48\x8f\x36\x51\x2d\x68\xe3\x44\xd3\x85\xc9\x88\x04\x10\xa3\x8b\x43\x85\x72\xc5\xb3\x6f\xc5\x07\x82\xc0\xd0\x08\xef\x55\x20\x5a\x08\x16\x4b\xbc\x44\x39\xe5\xa5\xae\xb0\xda\x4e\x0e\x05\x1a\x15\x58\xa9\xa5\x90\xa4\x35\xa1\xb1\x51\x1b\x2d\xc9\x79\x94\x3e\x6a\xa1\x59\xc2\x2c\x13\xe2\xf9\x5a\x17\x9a\x3f\x4b\x28\x01\x31\xe0\x69\x63\x8d\xf7\xf2\x12\xff\xe1\x5e\x20\xfe\x97\x91\x1c\x5a\xc1\x90\xf2\x11\xcc\xc8\x49\xa4\x69\x0e\xa2\x3c\x50\xd0\x57\x26\xee\x9c\xf0\xd4\xc9\x1e\x1a\x3e\x05\x89\xe0\x24\x28\xa2\xd4\x33\x2d\x90\x66\x0a\x2d\x40\x06\xa4\xb5\x8a\xd7\xe4\x99\x16\xd3\xe1\xe4\x77\xab\xdc\x7a\x4a\x7e\x54\x44\x99\xfc\x7c\xbd\x17\x5f\x3d\xbb\xc0\x4d\x98\x27\xab\x15\xbc\xf1\xd2\xa8\x5c\xd5\x94\x6d\x68\xaa\x72\xf6\x6f\x48\x34\x2a\x24\xcc\xe9\xea\xe8\x09\x96\xb3\x12\x4f\x9c\xc6\xc8\x2a\x9c\x71\xe6\xea\x0d\x6f\xb6\xa8\x81\x89\xd6\x27\x92\x9e\x42\xb5\x37\x0d\x4c\x5c\xea\x34\xd2\xb3\x3a\x72\x12\xe9\x6d\x87\x1e\x43\x7a\xe0\x86\x16\xb9\x76\x96\xe3\xb1\x5d\x93\xbc\xb5\x55\x7d\x76\xdd\xc5\x5f\x20\x2f\xf4\xfa\xaf\xf5\x93\x99\xde\x4c\x6e\xd1\xe6\x42\xe6\xb5\xb8\x37\x1f\x3b\x91\x59\xd3\x04\xff\xd4\x79\x79\xe9\x17\xc5\xa4\x9c\xd9\xfb\x4c\x5d\x77\xfb\xdd\x31\xec\xda\x6b\x08\x86\x66\x27\xca\x41\x67\x82\x7c\xea\x14\xc6\x0d\x1b\x64\x33\x13\x07\x93\xf1\xfd\x54\x3c\x03\x7f\x9c\x3e\x0d\xeb\x9d\x4e\x6d\xb2\x51\xce\x28\x87\x68\x4e\x81\x91\xa8\xa4\x11\x83\x79\x1d\x65\x7f\x62\x52\x5e\x94\x3b\xcf\x6f\x7a\xf6\x4f\x91\x5e\x17\xf0\xa9\x03\x8e\x12\xc7\xf9\xf6\x83\xaf\x1a\x49\x1d\xb4\xbe\xbc\xbf\xfd\xe8\x4a\xdf\x9d\xaf\x03\x00\xf0\xc8\x57\xc4\x11\x25\x9f\x3a\xe6\xfd\x6f\x0d\xfe\xed\x4c\xf3\xce\xb1\x6b\x64\x9c\xa0\xad\xb3\xcc\x10\x38\x98\xed\x10\x74\x8d\xd3\x03\xce\x72\xdf\x9f\x0b\x13\x23\x7d\xad\xa9\xd0\x91\xc3\x04\x17\xcd\x0d\x92\x89\x2b\x23\xd2\x77\x12\x01\xeb\x99\x43\xa6\x5c\x83\x5c\xe0\x03\xd7\x70\x2d\xf4\x2f\x5e\x24\x6c\x2d\x75\xb3\xd2\x02\x0c\x04\xe7\xed\xaa\xde\xcd\x50\x1c\xbd\x94\x5c\x03\x3d\xef\xfc\xff\x12\xad\xbf\xbd\x03\x7d\xad\x51\x53\xd1\x2b\xa4\x70\x25\xfc\x81\xa2\xd7\x4a\xb9\xed\xb0\x78\xe4\x65\x03\x42\xa8\x82\xdf\xba\xe1\xc8\x95\xd0\x26\x5b\xee\x63\xf8\x69\x40\x22\xc4\x33\x85\x23\x5f\x8d\xd9\x35\x37\xb0\xe2\x81\x9b\xb2\x69\xb2\x99\x1c\xb6\xf2\x6c\x63\xe8\x21\x61\x74\x0e\x46\xfa\x92\x85\xa7\x1f\x4c\x03\xdd\x9a\xc9\x13\x5e\x7d\x00\x95\x4c\xeb\x42\x21\xc1\x59\x40\x57\x5f\x67\x35\x81\xa4\x94\x97\x3a\xa6\xf5\x41\x10\xe4\x16\x17\x09\x43\x3a\x87\x69\xa8\x67\x3e\x2a\x95\x14\x34\xd1\xa5\xbc\xda\x05\xa8\x2a\x32\x53\x89\x17\x58\xe3\xd6\x9b\x74\xbe\xc0\x7c\xf0\x6a\xff\xcd\x4d\x08\xbf\x77\x32\x07\x02\x12\x6b\x20\x28\x8c\xb9\x6b\x02\xee\x2b\xed\x7e\x18\xff\x8f\x0a\x93\x94\xea\x6b\x0d\x11\x43\xad\x0a\x13\x42\xe7\x73\x94\xd1\x34\x63\x34\xcd\x5a\x5f\x9a\x79\xa0\xba\x0a\x98\x3b\x3a\x9f\x3f\x56\xfa\x17\xca\x14\x86\x60\x8e\x57\x8e\x9c\x29\xb0\x0f\xec\x02\x19\x1a\x4f\x78\xf5\x40\xb5\x61\x31\x34\x82\x21\x0b\xc6\xbe\x15\x94\x64\x58\xe2\x44\xbf\xbd\xd7\x78\xd0\xde\x60\xa3\x71\xae\xe1\x23\xc7\xd3\xbb\xe6\xde\x9e\x4b\x9f\xb6\x92\x26\x08\xcb\xf4\xe8\xc1\xbf\x31\xf2\x30\xe8\xcb\xf4\xd0\x21\xff\x7b\x67\xb7\x7d\x5b\x7b\x45\x09\x8e\xef\x08\x19\x26\x7e\x1b\x28\x76\x77\x9a\x2e\xb9\x14\x3a\x1a\x52\x8a\x13\xfb\x52\xbb\x2c\x8c\xfc\x85\x49\x24\x4c\xf0\x00\x4f\x0c\x8c\xf8\x85\x29\x14\x25\x63\xed\x19\x8c\x4a\x16\xd8\x4b\xb4\x89\xcb\xd6\xe6\x1f\x06\x57\xb1\xec\x33\x91\x06\xe7\x73\x26\xd2\x5b\xa7\xf3\x26\xa9\xbb\x54\xbf\xd5\x59\x80\x5c\x47\x33\xac\x68\xe2\x56\x81\xce\xb6\x3d\x92\x98\xa7\x10\xc5\x43\x91\xa6\x36\xcf\x6c\x5a\x6f\x2d\x6b\x5d\xbf\x36\x8e\xfb\xff\x23\xe4\x37\x17\x0b\x34\xd9\x57\x8b\xab\x2f\x7a\xd7\x1e\xd5\xd1\x7b\xdd\x30\x53\xa2\xd0\x9b\xfb\x6c\xfb\xd6\x7a\x85\x84\x5a\x6b\xb8\xdf\x50\xd8\xa7\x3b\x3c\x6a\xb6\xf7\x5a\x45\xeb\xa8\x9d\xb1\xae\xff\x56\xfd\xe2\x7f\xfa\x1f\x6f\xfe\x85\xc1\x5c\x08\xd3\xa9\xdb\xff\x61\xf0\x9f\x00\x00\x00\xff\xff\x7d\x38\x85\x96\x9b\x41\x00\x00" func adminConfigTmplBytes() ([]byte, error) { return bindataRead( @@ -332,8 +332,8 @@ func adminConfigTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "admin/config.tmpl", size: 16782, mode: os.FileMode(0644), modTime: time.Unix(1582368852, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x74, 0xee, 0xc9, 0x60, 0xde, 0xb, 0x5d, 0x73, 0x6b, 0xdd, 0xf9, 0x8b, 0x51, 0xf5, 0x14, 0xb1, 0xc2, 0x86, 0x89, 0xd4, 0x49, 0xd1, 0x78, 0x14, 0x4f, 0x45, 0x4a, 0xb3, 0x8f, 0xca, 0x79, 0x83}} + info := bindataFileInfo{name: "admin/config.tmpl", size: 16795, mode: os.FileMode(0644), modTime: time.Unix(1582369084, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xa, 0x9b, 0x22, 0xa6, 0x6e, 0xe9, 0xaf, 0xc5, 0x89, 0xb, 0x2a, 0xe1, 0xeb, 0x6b, 0xca, 0x27, 0x71, 0x3b, 0x1a, 0x8e, 0x27, 0xf7, 0x8e, 0xfb, 0x65, 0x43, 0x63, 0x2b, 0xd9, 0x8a, 0x2f, 0xc6}} return a, nil } diff --git a/internal/cmd/admin.go b/internal/cmd/admin.go index e0f38a86e..d9275d0fe 100644 --- a/internal/cmd/admin.go +++ b/internal/cmd/admin.go @@ -43,7 +43,7 @@ to make automatic initialization process more smoothly`, stringFlag("password", "", "User password"), stringFlag("email", "", "User email address"), boolFlag("admin", "User is an admin"), - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } @@ -55,7 +55,7 @@ to make automatic initialization process more smoothly`, "All inactivate accounts have been deleted successfully", ), Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } @@ -67,7 +67,7 @@ to make automatic initialization process more smoothly`, "All repositories archives have been deleted successfully", ), Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } @@ -79,7 +79,7 @@ to make automatic initialization process more smoothly`, "All repositories archives have been deleted successfully", ), Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } @@ -91,7 +91,7 @@ to make automatic initialization process more smoothly`, "All repositories have done garbage collection successfully", ), Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } @@ -103,7 +103,7 @@ to make automatic initialization process more smoothly`, "All public keys have been rewritten successfully", ), Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } @@ -115,7 +115,7 @@ to make automatic initialization process more smoothly`, "All repositories' pre-receive, update and post-receive hooks have been resynced successfully", ), Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } @@ -127,7 +127,7 @@ to make automatic initialization process more smoothly`, "All repository records that lost Git files have been reinitialized successfully", ), Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } ) diff --git a/internal/cmd/backup.go b/internal/cmd/backup.go index c4435e1a4..6448ce952 100644 --- a/internal/cmd/backup.go +++ b/internal/cmd/backup.go @@ -31,7 +31,7 @@ which can be used for migrating Gogs to another server. The output format is mea portable among all supported database engines.`, Action: runBackup, Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), boolFlag("verbose, v", "Show process details"), stringFlag("tempdir, t", os.TempDir(), "Temporary directory path"), stringFlag("target", "./", "Target directory path to save backup archive"), diff --git a/internal/cmd/hook.go b/internal/cmd/hook.go index cac190972..8c7cf91be 100644 --- a/internal/cmd/hook.go +++ b/internal/cmd/hook.go @@ -34,7 +34,7 @@ var ( Usage: "Delegate commands to corresponding Git hooks", Description: "All sub-commands should only be called by Git", Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, Subcommands: []cli.Command{ subcmdHookPreReceive, diff --git a/internal/cmd/import.go b/internal/cmd/import.go index e9795693b..5dbac9c14 100644 --- a/internal/cmd/import.go +++ b/internal/cmd/import.go @@ -37,7 +37,7 @@ without manually hacking the data files`, Flags: []cli.Flag{ stringFlag("source", "", "Source directory that stores new locale files"), stringFlag("target", "", "Target directory that stores old locale files"), - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } ) diff --git a/internal/cmd/restore.go b/internal/cmd/restore.go index 35cabea95..63d753a6d 100644 --- a/internal/cmd/restore.go +++ b/internal/cmd/restore.go @@ -32,7 +32,7 @@ If corresponding files or database tables are not presented in the archive, they be skipped and remain unchanged.`, Action: runRestore, Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), boolFlag("verbose, v", "Show process details"), stringFlag("tempdir, t", os.TempDir(), "Temporary directory path"), stringFlag("from", "", "Path to backup archive"), diff --git a/internal/cmd/serv.go b/internal/cmd/serv.go index 567f4572f..b6df787ef 100644 --- a/internal/cmd/serv.go +++ b/internal/cmd/serv.go @@ -31,7 +31,7 @@ var Serv = cli.Command{ Description: `Serv provide access auth for repositories`, Action: runServ, Flags: []cli.Flag{ - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } diff --git a/internal/cmd/web.go b/internal/cmd/web.go index 6a61f54a5..306a4439f 100644 --- a/internal/cmd/web.go +++ b/internal/cmd/web.go @@ -53,7 +53,7 @@ and it takes care of all the other things for you`, Action: runWeb, Flags: []cli.Flag{ stringFlag("port, p", "3000", "Temporary port number to prevent conflict"), - stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"), + stringFlag("config, c", "", "Custom configuration file path"), }, } diff --git a/internal/conf/conf.go b/internal/conf/conf.go index 0850962e4..01585f1a3 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -72,12 +72,13 @@ func Init(customConf string) error { } File.NameMapper = ini.SnackCase - customConf, err = filepath.Abs(customConf) - if err != nil { - return errors.Wrap(err, "get absolute path") - } if customConf == "" { - customConf = filepath.Join(CustomDir(), "conf/app.ini") + customConf = filepath.Join(CustomDir(), "conf", "app.ini") + } else { + customConf, err = filepath.Abs(customConf) + if err != nil { + return errors.Wrap(err, "get absolute path") + } } CustomConf = customConf