From 2481ac9f70ead93ad7495f372bb4d6f244413d60 Mon Sep 17 00:00:00 2001 From: Adrian Heine Date: Wed, 26 Apr 2017 21:42:11 +0200 Subject: [PATCH] Update --- src/symbols/nginx/reload.rs | 6 ------ src/symbols/nginx/server.rs | 4 +++- src/symbols/not_a_symlink.rs | 3 --- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/symbols/nginx/reload.rs b/src/symbols/nginx/reload.rs index ac6daa1..488a7a2 100644 --- a/src/symbols/nginx/reload.rs +++ b/src/symbols/nginx/reload.rs @@ -1,19 +1,13 @@ use std::error::Error; use std::fmt; -use std::io; -use std::ops::Deref; use command_runner::CommandRunner; use symbols::Symbol; -use symbols::file::File as FileSymbol; -use resources::Resource; pub struct NginxReload<'a> { command_runner: &'a CommandRunner, } -use std::borrow::Cow; - impl<'a> NginxReload<'a> { pub fn new(command_runner: &'a CommandRunner) -> Self { NginxReload { diff --git a/src/symbols/nginx/server.rs b/src/symbols/nginx/server.rs index 92d894d..f3f5215 100644 --- a/src/symbols/nginx/server.rs +++ b/src/symbols/nginx/server.rs @@ -64,7 +64,9 @@ impl<'a> NginxServer<'a, String> { } pub fn new_redir(domain: &'a str, target: &'a str, command_runner: &'a CommandRunner) -> Self { - let content = NginxServer::server_config(domain, &format!("return 302 $scheme://{}$request_uri;", target)); + let content = NginxServer::server_config(domain, &format!("location / {{ + return 301 $scheme://{}$request_uri; +}}", target)); NginxServer::new(domain, content, command_runner) } diff --git a/src/symbols/not_a_symlink.rs b/src/symbols/not_a_symlink.rs index 081b2aa..771c69e 100644 --- a/src/symbols/not_a_symlink.rs +++ b/src/symbols/not_a_symlink.rs @@ -2,11 +2,8 @@ use std::error::Error; use std::fmt; use std::fs; use std::io; -use std::ops::Deref; -use std::path::Path; use symbols::Symbol; -use resources::{DirResource, Resource}; pub struct NotASymlink where D: AsRef + fmt::Display { path: D