Skip to content

Commit 8ddcb0d

Browse files
author
Marius Cramer
committed
Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: interface/lib/classes/remoting.inc.php interface/web/sites/web_vhost_subdomain_edit.php server/plugins-available/cron_plugin.inc.php
2 parents 05481a4 + c926259 commit 8ddcb0d

File tree

10 files changed

+21
-16
lines changed

10 files changed

+21
-16
lines changed

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ public function configure_apache()
677677

678678
$content = rf('/etc/apache2/httpd.conf');
679679
if(!stristr($content, 'Include /etc/apache2/sites-enabled/')) {
680-
af('/etc/apache2/httpd.conf', "\n<Directory /srv/www>\n Options FollowSymlinks\n</Directory>\n\nInclude /etc/apache2/sites-enabled/\n\n");
680+
af('/etc/apache2/httpd.conf', "\n<Directory /srv/www>\n Options +FollowSymlinks\n</Directory>\n\nInclude /etc/apache2/sites-enabled/\n\n");
681681
}
682682
unset($content);
683683

‎install/dist/tpl/gentoo/apache_apps.vhost.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
DocumentRoot {apps_vhost_dir}
1616
SuexecUserGroup ispapps ispapps
1717
<Directory {apps_vhost_dir}>
18-
Options Indexes FollowSymLinks MultiViews +ExecCGI
18+
Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
1919
AllowOverride AuthConfig Indexes Limit Options FileInfo
2020
<FilesMatch "\.ph(p[3-5]?|tml)$">
2121
SetHandler fcgid-script
@@ -31,7 +31,7 @@
3131
DocumentRoot {apps_vhost_dir}
3232
AddType application/x-httpd-php .php
3333
<Directory {apps_vhost_dir}>
34-
Options FollowSymLinks
34+
Options +FollowSymLinks
3535
AllowOverride None
3636
Order allow,deny
3737
Allow from all

‎install/dist/tpl/gentoo/apache_ispconfig.vhost.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ NameVirtualHost *:{vhost_port}
1414
DocumentRoot /var/www/ispconfig/
1515
SuexecUserGroup ispconfig ispconfig
1616
<Directory /var/www/ispconfig/>
17-
Options Indexes FollowSymLinks MultiViews +ExecCGI
17+
Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
1818
AllowOverride AuthConfig Indexes Limit Options FileInfo
1919
<FilesMatch "\.ph(p[3-5]?|tml)$">
2020
SetHandler fcgid-script
@@ -30,7 +30,7 @@ NameVirtualHost *:{vhost_port}
3030
DocumentRoot /usr/local/ispconfig/interface/web/
3131
AddType application/x-httpd-php .php
3232
<Directory /usr/local/ispconfig/interface/web>
33-
Options FollowSymLinks
33+
Options +FollowSymLinks
3434
AllowOverride None
3535
Order allow,deny
3636
Allow from all

‎install/sql/incremental/upd_0068.sql‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ALTER TABLE `dbispconfig`.`web_domain` ADD UNIQUE `serverdomain` ( `server_id` , `domain` );
2-
DROP INDEX rr ON dns_rr;
3-
ALTER TABLE `dns_rr` CHANGE `name` `name` VARCHAR( 128 ) NOT NULL ;
4-
CREATE INDEX `rr` ON dns_rr (`zone`,`type`,`name`);
2+
3+
ALTER TABLE `dns_rr` DROP KEY rr,
4+
CHANGE `name` `name` VARCHAR( 128 ) NOT NULL,
5+
ADD KEY `rr` (`zone`,`type`,`name`);

‎install/tpl/apache_apps.vhost.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
AddType application/x-httpd-php .php
2121
<Directory {apps_vhost_dir}>
2222
# php_admin_value open_basedir "{apps_vhost_dir}:/usr/share:/tmp"
23-
Options FollowSymLinks
23+
Options +FollowSymLinks
2424
AllowOverride None
2525
Order allow,deny
2626
Allow from all
@@ -31,7 +31,7 @@
3131
DocumentRoot {apps_vhost_dir}
3232
SuexecUserGroup ispapps ispapps
3333
<Directory {apps_vhost_dir}>
34-
Options Indexes FollowSymLinks MultiViews +ExecCGI
34+
Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
3535
AllowOverride AuthConfig Indexes Limit Options FileInfo
3636
AddHandler fcgid-script .php
3737
FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php

‎install/tpl/apache_ispconfig.vhost.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ NameVirtualHost *:{vhost_port}
1818
DocumentRoot /var/www/ispconfig/
1919
SuexecUserGroup ispconfig ispconfig
2020
<Directory /var/www/ispconfig/>
21-
Options -Indexes FollowSymLinks MultiViews +ExecCGI
21+
Options -Indexes +FollowSymLinks +MultiViews +ExecCGI
2222
AllowOverride AuthConfig Indexes Limit Options FileInfo
2323
AddHandler fcgid-script .php
2424
FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
@@ -35,7 +35,7 @@ NameVirtualHost *:{vhost_port}
3535
AddType application/x-httpd-php .php
3636
<Directory /usr/local/ispconfig/interface/web>
3737
# php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
38-
Options FollowSymLinks
38+
Options +FollowSymLinks
3939
AllowOverride None
4040
Order allow,deny
4141
Allow from all

‎interface/web/client/form/domain.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
1 => array ( 'type' => 'UNIQUE',
101101
'errmsg'=> 'domain_error_unique'),
102102
2 => array ( 'type' => 'REGEX',
103-
'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z\-]{2,10}$/',
103+
'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/',
104104
'errmsg'=> 'domain_error_regex'),
105105
),
106106
'default' => '',

‎server/conf/apache_apps.vhost.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
DocumentRoot {tmpl_var name='apps_vhost_dir'}
3535
SuexecUserGroup ispapps ispapps
3636
<Directory {tmpl_var name='apps_vhost_dir'}>
37-
Options Indexes FollowSymLinks MultiViews +ExecCGI
37+
Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
3838
AllowOverride AuthConfig Indexes Limit Options FileInfo
3939
AddHandler fcgid-script .php
4040
FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php

‎server/conf/vhost.conf.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</IfModule>
5858

5959
<Directory {tmpl_var name='web_document_root_www'}>
60-
Options FollowSymLinks
60+
Options +FollowSymLinks
6161
AllowOverride <tmpl_var name='allow_override'>
6262
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
6363
Require all granted
@@ -85,7 +85,7 @@
8585
</tmpl_if>
8686
</Directory>
8787
<Directory {tmpl_var name='web_document_root'}>
88-
Options FollowSymLinks
88+
Options +FollowSymLinks
8989
AllowOverride <tmpl_var name='allow_override'>
9090
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
9191
Require all granted

‎server/plugins-available/cron_plugin.inc.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,11 @@ function _write_crontab() {
232232

233233
$command .= "\t";
234234
if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
235+
<<<<<<< HEAD
235236
$command .= $job['command'] . " " . $log_target;
237+
=======
238+
$command .= $job['command'];
239+
>>>>>>> origin/stable-3.0.5
236240
}
237241

238242
if($job['type'] == 'chrooted') {

0 commit comments

Comments
 (0)