X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=78ee06f3153c58a9c6c385b2f95630e36e8fb28c;hb=6501d8ee84a1ecbcb1af32baa4df843e73b96c20;hp=64d63d27a14f178c1373f93ab7bbb751b1b21e9f;hpb=3896b2a5c49830087db5b49842b390b150b614ad;p=citadel.git

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 64d63d27a..78ee06f31 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -33,9 +33,10 @@ extern pthread_key_t MyConKey;
 char socket_dir[PATH_MAX];      /**< where to talk to our citadel server */
 static const char editor_absolut_dir[PATH_MAX]=EDITORDIR; /**< nailed to what configure gives us. */
 static char static_dir[PATH_MAX]; /**< calculated on startup */
+static char static_local_dir[PATH_MAX]; /**< calculated on startup */
 char  *static_dirs[]={ /**< needs same sort order as the web mapping */
 	(char*)static_dir,                  /** our templates on disk */
-	(char*)static_dir,                  /** our templates on disk */
+	(char*)static_local_dir,            /** user provided templates disk */
 	(char*)editor_absolut_dir           /** the editor on disk */
 };
 
@@ -747,8 +748,10 @@ int main(int argc, char **argv)
 			 (dirbuffer[0]!='\0')?"/":"");
 	basedir=RUNDIR;
 	COMPUTE_DIRECTORY(socket_dir);
-	basedir=DATADIR;
+	basedir=DATADIR "/static";
 	COMPUTE_DIRECTORY(static_dir);
+	basedir=DATADIR "/static.local";
+	COMPUTE_DIRECTORY(static_local_dir);
 	/** we should go somewhere we can leave our coredump, if enabled... */
 	lprintf(9, "Changing directory to %s\n", socket_dir);
 	if (chdir(webcitdir) != 0) {