Add a ${workdir}/vmod_cache subdirectory for caching compiled

VMODs. Otherwise jail_unix doesn't allow you to use VMODs.
varnishcache · Jan 7, 2017 · dd5d189 · dd5d189
1 parent 1041a3d
commit dd5d189
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
@@ -307,6 +307,12 @@ mgt_launch_child(struct cli *cli)
 
 	child_state = CH_STARTING;
 
+	if (VJ_make_vcldir("vmod_cache")) {
+		VCLI_Out(cli, "Could not create vmod cache dir");
+		VCLI_SetResult(cli, CLIS_UNKNOWN);
+		return;
+	}
+
 	/* Open pipe for mgr->child CLI */
 	AZ(pipe(cp));
 	heritage.cli_in = cp[0];

diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
@@ -207,7 +207,7 @@ vcc_ParseImport(struct vcc *tl)
 	AN(vmd);
 	AN(vmd->file_id);
 	VSB_printf(ifp->ini, "\t    \"%s\",\n", vmd->file_id);
-	VSB_printf(ifp->ini, "\t    \"./_vmod_%.*s.%s\"\n",
+	VSB_printf(ifp->ini, "\t    \"./vmod_cache/_vmod_%.*s.%s\"\n",
 	    PF(mod), vmd->file_id);
 	VSB_printf(ifp->ini, "\t    ))\n");
 	VSB_printf(ifp->ini, "\t\treturn(1);");