adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Sort out running as a user

Browse source
This commit is contained in:
Adrian Heine 2017-02-28 21:59:16 +01:00
parent f3b70607f1
commit 38cf1d6e98
5 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/symbols/nginx/server.rs
View file

@ -49,7 +49,7 @@ pub struct NginxServer<'a, C> where C: Deref<Target=str> {
use std::borrow::Cow;
impl<'a> NginxServer<'a, String> {
pub fn new(home: &'a str, domain: &'a str, static_path: &'a str, redir_domains: &[&'a str], command_runner: &'a CommandRunner) -> Self {
pub fn new(socket_path: &'a str, domain: &'a str, static_path: &'a str, redir_domains: &[&'a str], command_runner: &'a CommandRunner) -> Self {
let file_path: Cow<str> = Cow::from(String::from("/etc/nginx/sites-enabled/") + domain);
let redir_content = redir_domains.iter().map(|redir_domain| format!("server {{
@ -75,10 +75,10 @@ impl<'a> NginxServer<'a, String> {
location @proxy {{
include fastcgi_params;
proxy_pass http://unix:{}/var/service.socket:;
proxy_pass http://unix:{}:;
proxy_redirect off;
}}
}}", domain, static_path, home);
}}", domain, static_path, socket_path);
NginxServer {
command_runner: command_runner,
file: FileSymbol::new(file_path, content)

20
src/symbols/systemd/node_js_user_service.rs
View file

@ -56,6 +56,7 @@ impl<E: Error> fmt::Display for NodeJsSystemdUserServiceError<E> {
pub struct NodeJsSystemdUserService<'a, P, C> where P: AsRef<str> + fmt::Display, C: Deref<Target=str> {
name: &'a str,
home: &'a str,
uid: u32,
path: P,
command_runner: &'a CommandRunner,
file: FileSymbol<C, Cow<'a, str>>
@ -64,20 +65,24 @@ pub struct NodeJsSystemdUserService<'a, P, C> where P: AsRef<str> + fmt::Display
use std::borrow::Cow;
impl<'a> NodeJsSystemdUserService<'a, Cow<'a, str>, String> {
pub fn new(home: &'a str, name: &'a str, path: &'a str, command_runner: &'a CommandRunner) -> Self {
pub fn new(home: &'a str, uid: u32, name: &'a str, path: &'a str, command_runner: &'a CommandRunner) -> Self {
let file_path: Cow<str> = Cow::from(String::from(home.trim_right()) + "/.config/systemd/user/" + name + ".service");
let content = format!("[Service]
ExecStart=/usr/bin/nodejs {}
ExecStartPre=rm /var/tmp/{1}-{2}.socket
ExecStart=/usr/bin/nodejs {0}
Restart=always
Environment=NODE_ENV=production
Environment=PORT={}/var/service.socket
Environment=PORT=/var/tmp/{1}-{2}.socket
#RuntimeDirectory=service
#RuntimeDirectoryMode=766
[Install]
WantedBy=default.target
", path, home);
", path, uid, name);
NodeJsSystemdUserService {
name: name,
uid: uid,
home: home,
path: file_path.clone(),
command_runner: command_runner,
@ -121,9 +126,6 @@ impl<'a, P, C> Symbol for NodeJsSystemdUserService<'a, P, C> where P: AsRef<str>
}
fn execute(&self) -> Result<(), Box<Error>> {
try!(self.command_runner.run_with_args("mkdir", &["-p", &format!("{}/var", self.home)]));
try!(self.command_runner.run_with_args("rm", &[&format!("{}/var/service.socket", self.home)]));
try!(self.command_runner.run_with_args("mkdir", &["-p", Path::new(self.path.as_ref()).parent().unwrap().to_str().unwrap()]));
// FIXME: Permissions
// try!(create_dir_all(Path::new(&path).parent().unwrap()));
@ -136,7 +138,7 @@ impl<'a, P, C> Symbol for NodeJsSystemdUserService<'a, P, C> where P: AsRef<str>
if !(try!(self.check_if_service())) { return Err(Box::new(NodeJsSystemdUserServiceError::GenericError as NodeJsSystemdUserServiceError<io::Error>)); }
let file_name = format!("{}/var/service.socket", self.home);
let file_name = format!("/var/tmp/{}-{}.socket", self.uid, self.name);
// try!(self.command_runner.run_with_args("chmod", &["666", &file_name]));
sleep(Duration::from_millis(500));
@ -148,9 +150,11 @@ impl<'a, P, C> Symbol for NodeJsSystemdUserService<'a, P, C> where P: AsRef<str>
Ok(())
}
/* // FIXME
fn get_prerequisites(&self) -> Vec<Box<Resource>> {
self.file.get_prerequisites()
}
*/
}
impl<'a, P, C> fmt::Display for NodeJsSystemdUserService<'a, P, C> where P: AsRef<str> + fmt::Display, C: Deref<Target=str> {