差别
这里会显示出您选择的修订版和当前版本之间的差别。
| 两侧同时换到之前的修订记录 前一修订版 后一修订版 | 前一修订版 | ||
|
amh4.2:amh4.2.1_ssl_bug_fix [2018/03/30 11:28] root |
amh4.2:amh4.2.1_ssl_bug_fix [2018/04/04 14:12] root |
||
|---|---|---|---|
| 行 14: | 行 14: | ||
| \\ | \\ | ||
| <code> | <code> | ||
| - | ####### bug fix | + | ####### bug fix |
| - | $nginx_ssl_conf = file_get_contents($nginx_vhost_conf); | + | $nginx_ssl_conf = file_get_contents($nginx_vhost_conf); |
| - | $nginx_ssl_conf = preg_replace('/\n#------SSL BEGIN(.*)#------SSL END/is', '', $nginx_ssl_conf); | + | $nginx_ssl_conf = preg_replace('/\n#------SSL BEGIN(.*)#------SSL END/is', '', $nginx_ssl_conf); |
| - | file_put_contents($ssl_nginx_tmpfile, $nginx_ssl_conf); | + | file_put_contents($ssl_nginx_tmpfile, $nginx_ssl_conf); |
| - | $apache_ssl_conf = file_get_contents($apache_vhost_conf); | + | $apache_ssl_conf = file_get_contents($apache_vhost_conf); |
| - | $apache_ssl_conf = preg_replace('/\n#------SSL BEGIN(.*)#------SSL END/is', '', $apache_ssl_conf); | + | $apache_ssl_conf = preg_replace('/\n#------SSL BEGIN(.*)#------SSL END/is', '', $apache_ssl_conf); |
| - | file_put_contents($ssl_apache_tmpfile, $apache_ssl_conf); | + | file_put_contents($ssl_apache_tmpfile, $apache_ssl_conf); |
| - | $cmd = "amh module AMSSL-1.0 admin restore,{$ssl_vhost_new},;"; | + | $cmd = "amh module AMSSL-1.0 admin restore,{$ssl_vhost_new},;"; |
| - | $cmd = Functions::trim_cmd($cmd); | + | $cmd = Functions::trim_cmd($cmd); |
| - | shell_exec($cmd); | + | shell_exec($cmd); |
| - | ####### bug fix | + | ####### bug fix |
| </code> | </code> | ||
| 行 36: | 行 36: | ||
| /usr/local/amh/web/Controller/amssl.php中，大约第133行后，增加以下代码。 | /usr/local/amh/web/Controller/amssl.php中，大约第133行后，增加以下代码。 | ||
| <code> | <code> | ||
| - | $file3 = "{$ssl_dir}{$ssl_vhost_new}.csr"; | + | $file3 = "{$ssl_dir}{$ssl_vhost_new}.csr"; |
| </code> | </code> | ||
| /usr/local/amh/lib/modules/AMSSL-1.0/AMHScript 中大约第68行“**fi;**”循环语句后增加以下代码。\\ | /usr/local/amh/lib/modules/AMSSL-1.0/AMHScript 中大约第68行“**fi;**”循环语句后增加以下代码。\\ | ||
| <code> | <code> | ||
| - | chown www:www /usr/local/amh/conf/ssl/$vhost.csr | + | chown www:www /usr/local/amh/conf/ssl/$vhost.csr |
| - | chown www:www /usr/local/amh/conf/ssl/$vhost.key | + | chown www:www /usr/local/amh/conf/ssl/$vhost.key |
| - | chown www:www /usr/local/amh/conf/ssl/$vhost.cer | + | chown www:www /usr/local/amh/conf/ssl/$vhost.cer |
| </code> | </code> | ||
| \\ | \\ | ||
最后更改: in 2018/04/04 14:12