fixed parameters to awk in view

diff --git a/makefile b/makefile
index d666506d93caf9daf3a69b3440cbf22ff67c00a3..31e537813821d89dab55c5ccd6a5b5411c284136 100644 (file)
--- a/makefile
+++ b/makefile
@@ -20,6 +20,7 @@
 # along with OTT mirror. If not, see <http://www.gnu.org/licenses/>.
 
 
+
 CC   =g++
 CF   =-g -Wall -Wno-format-truncation
 L_CGI=-lcgi
@@ -244,7 +245,7 @@ mktree:
        $(CHMOD) g-r,g-w,g-x,o-r,o-w,o-x $(HIDDEN_DIR)
 
 cp_bin: $(BIN) setuid | mktree
-       $(CP) $(BIN) $(BIN_PATH)
+       $(CP) -p $(BIN) $(BIN_PATH)
 
 cp_conf: ottmirror.conf
        $(CP) ottmirror.conf $(CONF)

diff --git a/makefile.1.mak b/makefile.1.mak
index 07c1a9f7e7a330c1e6a1d1d5814675a343bae46c..4a4803920eb97f98174d95ef67835b9439618808 100644 (file)
--- a/makefile.1.mak
+++ b/makefile.1.mak
@@ -20,6 +20,7 @@
 # along with OTT mirror. If not, see <http://www.gnu.org/licenses/>.
 
 
+
 ###MAKE_CC:    CC=g++
 ###MAKE_CF:    CF=-g -Wall
 ###MAKE_L_CGI: L_CGI=-lcgi
@@ -244,7 +245,7 @@ mktree:
        $(CHMOD) g-r,g-w,g-x,o-r,o-w,o-x $(HIDDEN_DIR)
 
 cp_bin: $(BIN) setuid | mktree
-       $(CP) $(BIN) $(BIN_PATH)
+       $(CP) -p $(BIN) $(BIN_PATH)
 
 cp_conf: ottmirror.conf
        $(CP) ottmirror.conf $(CONF)

diff --git a/ottmirror.1.conf b/ottmirror.1.conf
index 9cdc5ab4aabca753e969b713233e095e215edf61..685d35913679cc65cea4ffd7eab306f344c5b618 100644 (file)
--- a/ottmirror.1.conf
+++ b/ottmirror.1.conf
@@ -8,6 +8,9 @@ Alias /ott/log ###CONF_log;
        Allow from all
 </Directory>
 
+<Directory ###CONF_www;>
+       Options MultiViews
+</Directory>
 
 ScriptAlias /ott/index ###CONF_index;
 ScriptAlias /ott/mpview ###CONF_mpview;

diff --git a/settings.txt b/settings.txt
index d2441599aed5f048f16acb557a2ac006debbd681..baece289a8818cb18a535dd3891ea3ad6f98432f 100644 (file)
--- a/settings.txt
+++ b/settings.txt
@@ -147,6 +147,8 @@ CONF_posted   = $_bin_posted_path
 CONF_redirect = $_bin_redirect_path
 CONF_update   = $_bin_update_path
 CONF_view     = $_bin_view_path
+#CONF_att      = $_www_att_path
+CONF_www      = $www_path
 
 
 AWK_default_subject_encoded= \t@_AWK_DEFINE_STR(default_subject_encoded,$_default_subject_encoded)
@@ -231,6 +233,7 @@ C_IND_PATH    = @_C_DEFINE_STR(IND_PATH,    $_www_ind_path)
 C_IND_PATH_3  = @_C_DEFINE_STR(IND_PATH,    $_www_ind_path_3)
 C_IND_PATH_3_ = @_C_DEFINE_STR(IND_PATH_3,  $_www_ind_path_3)
 C_INF_PATH    = @_C_DEFINE_STR(INF_PATH,    $_www_inf_path_)
+C_INF_PATH_E  = @_C_DEFINE_STR(INF_PATH,    otterinf=$_www_inf_path_)
 C_INFO_PATH   = @_C_DEFINE_STR(INFO_PATH,   $_www_info_path)
 C_LAST_PAGE   = @_C_DEFINE_STR(LAST_PAGE,   $_www_last_path)
 C_LIST_PATH   = @_C_DEFINE_STR(LIST_PATH,   $_www_list_path_)
@@ -239,6 +242,7 @@ C_NP_TOP_PATH = @_C_DEFINE_STR(NP_TOP_PATH, $_www_np_top_path)
 C_NP_END_PATH = @_C_DEFINE_STR(NP_END_PATH, $_www_np_end_path)
 C_POST_PATH   = @_C_DEFINE_STR(POST_PATH,   $_www_post_path)
 C_SIG_PATH    = @_C_DEFINE_STR(SIG_PATH,    $_www_sig_path_)
+C_SIG_PATH_E  = @_C_DEFINE_STR(SIG_PATH,    sig=$_www_sig_path_)
 C_TOP_PATH    = @_C_DEFINE_STR(TOP_PATH,    $_www_top_path)
 C_UP_PATH     = @_C_DEFINE_STR(UP_PATH,     $_www_up_path_)
 

diff --git a/view.1.cpp b/view.1.cpp
index 492d4bcaaa671476d0700ab2d88d48f5bd63beec..6f860e71a918ddbb27856d0e758d386d5e8c76df 100644 (file)
--- a/view.1.cpp
+++ b/view.1.cpp
@@ -33,8 +33,8 @@
 // ###C_NP_END_PATH: #define NP_END_PATH "/eizm/www/time/ott/np/end"
 // ###C_UP_PATH:     #define UP_PATH "/eizm/www/time/ott/np/"
 // ###C_LIST_PATH:   #define LIST_PATH "/eizm/www/time/ott/postlist/"
-// ###C_SIG_PATH:    #define SIG_PATH "sig=/eizm/www/time/ott/sig/"
-// ###C_INF_PATH:    #define INF_PATH "otterinf=/eizm/www/time/ott/otterinf/"
+// ###C_SIG_PATH_E:  #define SIG_PATH "sig=/eizm/www/time/ott/sig/"
+// ###C_INF_PATH_E:  #define INF_PATH "otterinf=/eizm/www/time/ott/otterinf/"
 // ###C_LAST_PAGE:   #define LAST_PAGE "/eizm/www/time/ott/np/last"
 // ###C_MLAST_PATH:  #define MLAST_PATH "/eizm/mem/ottmirror/mlist/last"