Skip to content

Commit 47efc0f

Browse files
author
Kristan Kenney
committed
Update template files for new webmail configuration
1 parent c60198f commit 47efc0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+219
-191
lines changed

install/deb/multiphp/nginx/PHP-56.stpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,5 @@ server {
4848

4949
include /etc/nginx/conf.d/phpmyadmin.inc*;
5050
include /etc/nginx/conf.d/phppgadmin.inc*;
51-
include /etc/nginx/conf.d/webmail.inc*;
52-
53-
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
51+
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
5452
}

install/deb/multiphp/nginx/PHP-56.tpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,5 @@ server {
4747

4848
include /etc/nginx/conf.d/phpmyadmin.inc*;
4949
include /etc/nginx/conf.d/phppgadmin.inc*;
50-
include /etc/nginx/conf.d/webmail.inc*;
51-
52-
include %home%/%user%/conf/web/%domain%/nginx.conf*;
50+
include %home%/%user%/conf/web/%domain%/nginx.conf_*;
5351
}

install/deb/multiphp/nginx/PHP-70.stpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,5 @@ server {
4848

4949
include /etc/nginx/conf.d/phpmyadmin.inc*;
5050
include /etc/nginx/conf.d/phppgadmin.inc*;
51-
include /etc/nginx/conf.d/webmail.inc*;
52-
53-
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
51+
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
5452
}

install/deb/multiphp/nginx/PHP-70.tpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,5 @@ server {
4747

4848
include /etc/nginx/conf.d/phpmyadmin.inc*;
4949
include /etc/nginx/conf.d/phppgadmin.inc*;
50-
include /etc/nginx/conf.d/webmail.inc*;
51-
52-
include %home%/%user%/conf/web/%domain%/nginx.conf*;
50+
include %home%/%user%/conf/web/%domain%/nginx.conf_*;
5351
}

install/deb/multiphp/nginx/PHP-71.stpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,5 @@ server {
4848

4949
include /etc/nginx/conf.d/phpmyadmin.inc*;
5050
include /etc/nginx/conf.d/phppgadmin.inc*;
51-
include /etc/nginx/conf.d/webmail.inc*;
52-
53-
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
51+
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
5452
}

install/deb/multiphp/nginx/PHP-71.tpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,5 @@ server {
4747

4848
include /etc/nginx/conf.d/phpmyadmin.inc*;
4949
include /etc/nginx/conf.d/phppgadmin.inc*;
50-
include /etc/nginx/conf.d/webmail.inc*;
51-
52-
include %home%/%user%/conf/web/%domain%/nginx.conf*;
50+
include %home%/%user%/conf/web/%domain%/nginx.conf_*;
5351
}

install/deb/multiphp/nginx/PHP-72.stpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,5 @@ server {
4848

4949
include /etc/nginx/conf.d/phpmyadmin.inc*;
5050
include /etc/nginx/conf.d/phppgadmin.inc*;
51-
include /etc/nginx/conf.d/webmail.inc*;
52-
53-
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
51+
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
5452
}

install/deb/multiphp/nginx/PHP-72.tpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,5 @@ server {
4747

4848
include /etc/nginx/conf.d/phpmyadmin.inc*;
4949
include /etc/nginx/conf.d/phppgadmin.inc*;
50-
include /etc/nginx/conf.d/webmail.inc*;
51-
52-
include %home%/%user%/conf/web/%domain%/nginx.conf*;
50+
include %home%/%user%/conf/web/%domain%/nginx.conf_*;
5351
}

install/deb/multiphp/nginx/PHP-73.stpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,5 @@ server {
4848

4949
include /etc/nginx/conf.d/phpmyadmin.inc*;
5050
include /etc/nginx/conf.d/phppgadmin.inc*;
51-
include /etc/nginx/conf.d/webmail.inc*;
52-
53-
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
51+
include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
5452
}

install/deb/multiphp/nginx/PHP-73.tpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,5 @@ server {
4747

4848
include /etc/nginx/conf.d/phpmyadmin.inc*;
4949
include /etc/nginx/conf.d/phppgadmin.inc*;
50-
include /etc/nginx/conf.d/webmail.inc*;
51-
52-
include %home%/%user%/conf/web/%domain%/nginx.conf*;
50+
include %home%/%user%/conf/web/%domain%/nginx.conf_*;
5351
}

0 commit comments

Comments
 (0)