Browse Source

Don't require static lifetime in serve_php

master
Adrian Heine 3 years ago
parent
commit
cbb5742ac3
  1. 3
      src/symbols/factory.rs
  2. 2
      src/symbols/nginx/server.rs

3
src/symbols/factory.rs

@ -1,3 +1,4 @@
use std::borrow::Cow;
use std::ops::Deref;
use std::path::Path;
@ -103,7 +104,7 @@ pm.max_children = 10"
)).into_action(self.symbol_runner)
}
pub fn serve_php<'a>(&'a self, host_name: &'static str, root_dir: &'static str) -> Box<Action + 'a> {
pub fn serve_php<'a>(&'a self, host_name: &'static str, root_dir: Cow<'a, str>) -> Box<Action + 'a> {
let user_name = self.policy.user_name_for_host(host_name);
let socket = self.get_php_fpm_pool_socket_path(&user_name);
Box::new(ListAction::new(vec![

2
src/symbols/nginx/server.rs

@ -100,7 +100,7 @@ location @proxy {{
NginxServer::new(domain, content, command_runner)
}
pub fn new_php(domain: &'a str, socket_path: Cow<'a, str>, static_path: &'a str, command_runner: &'a C) -> Self {
pub fn new_php(domain: &'a str, socket_path: Cow<'a, str>, static_path: Cow<'a, str>, command_runner: &'a C) -> Self {
let content = server_config(domain, &format!("
root {};
index index.html index.php;

Loading…
Cancel
Save