diff options
Diffstat (limited to 'segget')
-rw-r--r-- | segget/segget.conf | 17 | ||||
-rw-r--r-- | segget/settings.cpp | 1 | ||||
-rw-r--r-- | segget/settings.h | 2 | ||||
-rw-r--r-- | segget/ui_server.cpp | 4 | ||||
-rw-r--r-- | segget/webui/img/mirrors.jpg | bin | 0 -> 7609 bytes | |||
-rw-r--r-- | segget/webui/img/rss.jpg | bin | 0 -> 4591 bytes | |||
-rw-r--r-- | segget/webui/img/stats.jpg | bin | 0 -> 4360 bytes |
7 files changed, 22 insertions, 2 deletions
diff --git a/segget/segget.conf b/segget/segget.conf index f2de2f5..4d6413d 100644 --- a/segget/segget.conf +++ b/segget/segget.conf @@ -1,4 +1,15 @@ [folders] +# By default segget daemon will use the following folders for its files: +# /etc/seggetd - for config files for seggetd, tuiclient and request tool +# /usr/bin - binary files: seggetd, tuiclient, request +# /usr/share/seggetd/scripts - for user-side python script files +# /usr/share/seggetd/webui - for webui files +# /tmp/seggetd/pkg.list - to save distfile list generated by portage and parse it +# by request tool to segget daemon +# /tmp/seggetd/segments - to store segments +# /usr/portage/distfiles - to store ready to use distfiles +# /var/log/seggetd - to store log files + # DISTFILES_DIR # Define a dir to store distfiles # Default: @@ -269,6 +280,12 @@ ui_ip=127.0.0.1 # ui_port=9999 ui_port=9999 +# UI_WEB_UI_DIR +# Define a dir where segget stores webui files +# Default: +# ui_web_ui_dir=/usr/share/seggetd/webui +ui_web_ui_dir=/usr/share/seggetd/webui + [rss] # RSS feed provides information on the files added (symlinked) # to PROVIDE_MIRROR_DIR and can be accessed from feedreader diff --git a/segget/settings.cpp b/segget/settings.cpp index 69c3d1d..c3a0c8f 100644 --- a/segget/settings.cpp +++ b/segget/settings.cpp @@ -126,6 +126,7 @@ void Tsettings::init(){ } conf.set("ui_server","ui_ip",ui_ip); conf.set("ui_server","ui_port",ui_port,1,65535); + conf.set("ui_server","ui_web_ui_dir",ui_web_ui_dir); conf.set("provide_mirror_to_others","provide_mirror_to_others_url",provide_mirror_to_others_url); if (provide_mirror_to_others_url=="ui_ip"){ diff --git a/segget/settings.h b/segget/settings.h index 5523f90..3633aa4 100644 --- a/segget/settings.h +++ b/segget/settings.h @@ -78,6 +78,7 @@ class Tsettings{ //ui_server string ui_ip; ulong ui_port; + string ui_web_ui_dir; //rss string provide_mirror_to_others_url; string rss_title; @@ -137,6 +138,7 @@ class Tsettings{ //ui_server ui_ip("127.0.0.1"), ui_port(9999), + ui_web_ui_dir("/usr/share/seggetd/webui"), //rss provide_mirror_to_others_url("http://"+ui_ip), // init after ui_ip rss_title("Seggetd feed"), diff --git a/segget/ui_server.cpp b/segget/ui_server.cpp index eaa0f57..c92f079 100644 --- a/segget/ui_server.cpp +++ b/segget/ui_server.cpp @@ -653,9 +653,9 @@ void Tui_server::serve_browser(uint fd, string msg){ }else if (uri=="/distfiles_"){ ui_server.send_to_fd(fd,get_html_distfiles()); }else if (uri=="/favicon.ico"){ - ui_server.send_binary_to_fd(fd,"./webui/img/favicon.ico"); + ui_server.send_binary_to_fd(fd,settings.ui_web_ui_dir+"/favicon.ico"); }else if (uri.find("/img")!=uri.npos){ - ui_server.send_binary_to_fd(fd,"./webui"+uri); + ui_server.send_binary_to_fd(fd,settings.ui_web_ui_dir+uri); }else{ send_to_fd(fd,get_html_header("Connections")); send_to_fd(fd,"<span id=\"connections\">\n"); diff --git a/segget/webui/img/mirrors.jpg b/segget/webui/img/mirrors.jpg Binary files differnew file mode 100644 index 0000000..e1457d1 --- /dev/null +++ b/segget/webui/img/mirrors.jpg diff --git a/segget/webui/img/rss.jpg b/segget/webui/img/rss.jpg Binary files differnew file mode 100644 index 0000000..9365ab8 --- /dev/null +++ b/segget/webui/img/rss.jpg diff --git a/segget/webui/img/stats.jpg b/segget/webui/img/stats.jpg Binary files differnew file mode 100644 index 0000000..049f1dd --- /dev/null +++ b/segget/webui/img/stats.jpg |