mirror of
https://github.com/certbot/certbot.git
synced 2026-06-08 00:02:14 -04:00
Revert "Merge Augeas lens fix for continuations in section headings"
This commit is contained in:
bmw
parent
f86ae1c461
commit
b7a53541c5
2 changed files with 4 additions and 287 deletions
|
|
@ -45,8 +45,9 @@ autoload xfm
|
|||
let dels (s:string) = del s s
|
||||
|
||||
(* deal with continuation lines *)
|
||||
let sep_spc = del /([ \t]+|[ \t]*\\\\\r?\n[ \t]*)/ " "
|
||||
let sep_osp = del /([ \t]*|[ \t]*\\\\\r?\n[ \t]*)/ ""
|
||||
let sep_spc = del /([ \t]+|[ \t]*\\\\\r?\n[ \t]*)/ " "
|
||||
|
||||
let sep_osp = Sep.opt_space
|
||||
let sep_eq = del /[ \t]*=[ \t]*/ "="
|
||||
|
||||
let nmtoken = /[a-zA-Z:_][a-zA-Z0-9:_.-]*/
|
||||
|
|
@ -59,7 +60,7 @@ let indent = Util.indent
|
|||
|
||||
(* borrowed from shellvars.aug *)
|
||||
let char_arg_dir = /([^\\ '"{\t\r\n]|[^ '"{\t\r\n]+[^\\ \t\r\n])|\\\\"|\\\\'/
|
||||
let char_arg_sec = /[^\\ '"\t\r\n>]|\\\\"|\\\\'/
|
||||
let char_arg_sec = /[^ '"\t\r\n>]|\\\\"|\\\\'/
|
||||
let char_arg_wl = /([^\\ '"},\t\r\n]|[^ '"},\t\r\n]+[^\\ '"},\t\r\n])/
|
||||
|
||||
let cdot = /\\\\./
|
||||
|
|
|
|||
|
|
@ -1,284 +0,0 @@
|
|||
|
||||
NameVirtualHost 0.0.0.0:7080
|
||||
NameVirtualHost [00000:000:000:000::0]:7080
|
||||
NameVirtualHost 0.0.0.0:7080
|
||||
|
||||
NameVirtualHost 127.0.0.1:7080
|
||||
NameVirtualHost 0.0.0.0:7081
|
||||
NameVirtualHost [0000:000:000:000::2]:7081
|
||||
NameVirtualHost 0.0.0.0:7081
|
||||
|
||||
NameVirtualHost 127.0.0.1:7081
|
||||
|
||||
ServerName "example.com"
|
||||
ServerAdmin "srv@example.com"
|
||||
|
||||
DocumentRoot "/var/www/vhosts/default/htdocs"
|
||||
|
||||
<IfModule mod_logio.c>
|
||||
LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" plesklog
|
||||
</IfModule>
|
||||
<IfModule !mod_logio.c>
|
||||
LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" plesklog
|
||||
</IfModule>
|
||||
|
||||
TraceEnable off
|
||||
|
||||
ServerTokens ProductOnly
|
||||
|
||||
<Directory "/var/www/vhosts">
|
||||
AllowOverride "All"
|
||||
Options SymLinksIfOwnerMatch
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
|
||||
<IfModule sapi_apache2.c>
|
||||
php_admin_flag engine off
|
||||
</IfModule>
|
||||
|
||||
<IfModule mod_php5.c>
|
||||
php_admin_flag engine off
|
||||
</IfModule>
|
||||
|
||||
</Directory>
|
||||
|
||||
<Directory "/usr/lib/mailman">
|
||||
AllowOverride "All"
|
||||
Options SymLinksIfOwnerMatch
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
<IfModule sapi_apache2.c>
|
||||
php_admin_flag engine off
|
||||
</IfModule>
|
||||
<IfModule mod_php5.c>
|
||||
php_admin_flag engine off
|
||||
</IfModule>
|
||||
</Directory>
|
||||
|
||||
<IfModule mod_headers.c>
|
||||
Header add X-Powered-By PleskLin
|
||||
</IfModule>
|
||||
|
||||
<IfModule mod_security2.c>
|
||||
SecRuleEngine DetectionOnly
|
||||
SecRequestBodyAccess On
|
||||
SecRequestBodyLimit 134217728
|
||||
SecResponseBodyAccess Off
|
||||
SecResponseBodyLimit 524288
|
||||
SecAuditEngine On
|
||||
SecAuditLog "/var/log/modsec_audit.log"
|
||||
SecAuditLogType serial
|
||||
</IfModule>
|
||||
|
||||
Include "/etc/httpd/conf/plesk.conf.d/ip_default/*.conf"
|
||||
|
||||
<VirtualHost \
|
||||
0.0.0.0:7080 \
|
||||
[00000:000:000:0000::2]:7080 \
|
||||
0.0.0.0:7080 \
|
||||
127.0.0.1:7080 \
|
||||
>
|
||||
ServerName "default"
|
||||
UseCanonicalName Off
|
||||
DocumentRoot "/var/www/vhosts/default/htdocs"
|
||||
ScriptAlias "/cgi-bin/" "/var/www/vhosts/default/cgi-bin"
|
||||
|
||||
<IfModule mod_ssl.c>
|
||||
SSLEngine off
|
||||
</IfModule>
|
||||
|
||||
<Directory "/var/www/vhosts/default/cgi-bin">
|
||||
AllowOverride None
|
||||
Options None
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
<Directory "/var/www/vhosts/default/htdocs">
|
||||
|
||||
<IfModule sapi_apache2.c>
|
||||
php_admin_flag engine on
|
||||
</IfModule>
|
||||
|
||||
<IfModule mod_php5.c>
|
||||
php_admin_flag engine on
|
||||
</IfModule>
|
||||
|
||||
</Directory>
|
||||
|
||||
</VirtualHost>
|
||||
|
||||
<IfModule mod_ssl.c>
|
||||
|
||||
<VirtualHost \
|
||||
0.0.0.0:7081 \
|
||||
127.0.0.1:7081 \
|
||||
>
|
||||
ServerName "default-0_0_0_0"
|
||||
UseCanonicalName Off
|
||||
DocumentRoot "/var/www/vhosts/default/htdocs"
|
||||
ScriptAlias "/cgi-bin/" "/var/www/vhosts/default/cgi-bin"
|
||||
|
||||
SSLEngine on
|
||||
SSLVerifyClient none
|
||||
SSLCertificateFile "/usr/local/psa/var/certificates/certGXCBZ4r"
|
||||
|
||||
<Directory "/var/www/vhosts/default/cgi-bin">
|
||||
AllowOverride None
|
||||
Options None
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
<Directory "/var/www/vhosts/default/htdocs">
|
||||
|
||||
<IfModule sapi_apache2.c>
|
||||
php_admin_flag engine on
|
||||
</IfModule>
|
||||
|
||||
<IfModule mod_php5.c>
|
||||
php_admin_flag engine on
|
||||
</IfModule>
|
||||
|
||||
</Directory>
|
||||
|
||||
</VirtualHost>
|
||||
<VirtualHost \
|
||||
[00000:000:000:000::2]:7081 \
|
||||
127.0.0.1:7081 \
|
||||
>
|
||||
ServerName "default-0000_000_000_00000__2"
|
||||
UseCanonicalName Off
|
||||
DocumentRoot "/var/www/vhosts/default/htdocs"
|
||||
ScriptAlias "/cgi-bin/" "/var/www/vhosts/default/cgi-bin"
|
||||
|
||||
SSLEngine on
|
||||
SSLVerifyClient none
|
||||
SSLCertificateFile "/usr/local/psa/var/certificates/certGXCBZ4r"
|
||||
|
||||
<Directory "/var/www/vhosts/default/cgi-bin">
|
||||
AllowOverride None
|
||||
Options None
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
<Directory "/var/www/vhosts/default/htdocs">
|
||||
|
||||
<IfModule sapi_apache2.c>
|
||||
php_admin_flag engine on
|
||||
</IfModule>
|
||||
|
||||
<IfModule mod_php5.c>
|
||||
php_admin_flag engine on
|
||||
</IfModule>
|
||||
|
||||
</Directory>
|
||||
|
||||
</VirtualHost>
|
||||
<VirtualHost \
|
||||
0.0.0.0:7081 \
|
||||
127.0.0.1:7081 \
|
||||
>
|
||||
ServerName "default-0_0_0_0"
|
||||
UseCanonicalName Off
|
||||
DocumentRoot "/var/www/vhosts/default/htdocs"
|
||||
ScriptAlias "/cgi-bin/" "/var/www/vhosts/default/cgi-bin"
|
||||
|
||||
SSLEngine on
|
||||
SSLVerifyClient none
|
||||
SSLCertificateFile "/usr/local/psa/var/certificates/cert-Nv4Tz5"
|
||||
|
||||
SSLCACertificateFile "/usr/local/psa/var/certificates/cert-nLy6Z1"
|
||||
|
||||
<Directory "/var/www/vhosts/default/cgi-bin">
|
||||
AllowOverride None
|
||||
Options None
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
<Directory "/var/www/vhosts/default/htdocs">
|
||||
|
||||
<IfModule sapi_apache2.c>
|
||||
php_admin_flag engine on
|
||||
</IfModule>
|
||||
|
||||
<IfModule mod_php5.c>
|
||||
php_admin_flag engine on
|
||||
</IfModule>
|
||||
|
||||
</Directory>
|
||||
|
||||
</VirtualHost>
|
||||
|
||||
</IfModule>
|
||||
|
||||
<VirtualHost \
|
||||
0.0.0.0:7080 \
|
||||
[0000:000:000:000::2]:7080 \
|
||||
0.0.0.0:7080 \
|
||||
127.0.0.1:7080 \
|
||||
>
|
||||
DocumentRoot "/var/www/vhosts/default/htdocs"
|
||||
ServerName lists
|
||||
ServerAlias lists.*
|
||||
UseCanonicalName Off
|
||||
|
||||
ScriptAlias "/mailman/" "/usr/lib/mailman/cgi-bin/"
|
||||
|
||||
Alias "/icons/" "/var/www/icons/"
|
||||
Alias "/pipermail/" "/var/lib/mailman/archives/public/"
|
||||
|
||||
<IfModule mod_ssl.c>
|
||||
SSLEngine off
|
||||
</IfModule>
|
||||
|
||||
<Directory "/var/lib/mailman/archives/">
|
||||
Options FollowSymLinks
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
</VirtualHost>
|
||||
|
||||
<IfModule mod_ssl.c>
|
||||
<VirtualHost \
|
||||
0.0.0.0:7081 \
|
||||
[00000:000:000:0000::2]:7081 \
|
||||
0.0.0.0:7081 \
|
||||
127.0.0.1:7081 \
|
||||
>
|
||||
DocumentRoot "/var/www/vhosts/default/htdocs"
|
||||
ServerName lists
|
||||
ServerAlias lists.*
|
||||
UseCanonicalName Off
|
||||
|
||||
ScriptAlias "/mailman/" "/usr/lib/mailman/cgi-bin/"
|
||||
|
||||
Alias "/icons/" "/var/www/icons/"
|
||||
Alias "/pipermail/" "/var/lib/mailman/archives/public/"
|
||||
|
||||
SSLEngine on
|
||||
SSLVerifyClient none
|
||||
SSLCertificateFile "/usr/local/psa/var/certificates/cert-Nv4Tz5"
|
||||
|
||||
<Directory "/var/lib/mailman/archives/">
|
||||
Options FollowSymLinks
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
</VirtualHost>
|
||||
</IfModule>
|
||||
|
||||
<IfModule mod_rpaf.c>
|
||||
RPAFproxy_ips 0.0.0.0 [00000:000:000:00000::2] 0.0.0.0
|
||||
</IfModule>
|
||||
<IfModule mod_rpaf-2.0.c>
|
||||
RPAFproxy_ips 0.0.0.0 [0000:000:000:0000::2] 0.0.0.0
|
||||
</IfModule>
|
||||
<IfModule mod_remoteip.c>
|
||||
RemoteIPInternalProxy 0.0.0.0 [0000:000:000:0000::2] 0.0.0.0
|
||||
RemoteIPHeader X-Forwarded-For
|
||||
</IfModule>
|
||||
Loading…
Reference in a new issue