diff options
author | 2015-08-04 22:21:43 -0400 | |
---|---|---|
committer | 2015-08-05 01:01:22 -0400 | |
commit | d05b5f04c92034eae1675dc8102247a3cc3315f7 (patch) | |
tree | 9721a1cfddc4b234ff302922da01cc3da0eb0fb9 /deploy/adapters/cobbler/conf/cobbler.conf | |
parent | 79b571dae951ba9bfe36440750c1a1408b19cd69 (diff) |
delete the windows newline character
JIRA: COMPASS-7
Change-Id: Iffd549877b8cc50a995bdc59adf1f05c0fcb1d5e
Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/adapters/cobbler/conf/cobbler.conf')
-rw-r--r-- | deploy/adapters/cobbler/conf/cobbler.conf | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/deploy/adapters/cobbler/conf/cobbler.conf b/deploy/adapters/cobbler/conf/cobbler.conf index 3789232d..fa4457f2 100644 --- a/deploy/adapters/cobbler/conf/cobbler.conf +++ b/deploy/adapters/cobbler/conf/cobbler.conf @@ -1,40 +1,40 @@ -# This configuration file allows cobbler data
-# to be accessed over HTTP.
-
-AliasMatch ^/cblr/svc/op/ks/system/(.*)?$ "/var/www/cblr_ks/$1"
-AliasMatch ^/cblr(?!/svc/)(.*)?$ "/var/www/cobbler$1"
-AliasMatch ^/cobbler_track(.*)?$ "/var/www/cobbler$1"
-#AliasMatch ^/cobbler(.*)?$ "/var/www/cobbler$1"
-Alias /cobbler /var/www/cobbler
-Alias /cobbler_webui_content /var/www/cobbler_webui_content
-
-WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /var/www/cobbler/svc/services.py
-
-<Directory "/var/www/cobbler">
- Options Indexes FollowSymLinks
- Order allow,deny
- Allow from all
-</Directory>
-
-ProxyRequests off
-
-ProxyPass /cobbler_api http://localhost:25151/
-ProxyPassReverse /cobbler_api http://localhost:25151/
-
-BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
-
-# the webui is now part of the "cobbler-web" package
-# and is visited at http://.../cobbler_web not this URL.
-# this is only a pointer to the new page.
-
-<Directory "/var/www/cobbler/web/">
- Options Indexes FollowSymLinks
- Order allow,deny
- Allow from all
-</Directory>
-
-<Directory "/var/www/cblr_ks/">
- Options Indexes FollowSymLinks
- Order allow,deny
- Allow from all
-</Directory>
+# This configuration file allows cobbler data +# to be accessed over HTTP. + +AliasMatch ^/cblr/svc/op/ks/system/(.*)?$ "/var/www/cblr_ks/$1" +AliasMatch ^/cblr(?!/svc/)(.*)?$ "/var/www/cobbler$1" +AliasMatch ^/cobbler_track(.*)?$ "/var/www/cobbler$1" +#AliasMatch ^/cobbler(.*)?$ "/var/www/cobbler$1" +Alias /cobbler /var/www/cobbler +Alias /cobbler_webui_content /var/www/cobbler_webui_content + +WSGIScriptAliasMatch ^/cblr/svc/([^/]*) /var/www/cobbler/svc/services.py + +<Directory "/var/www/cobbler"> + Options Indexes FollowSymLinks + Order allow,deny + Allow from all +</Directory> + +ProxyRequests off + +ProxyPass /cobbler_api http://localhost:25151/ +ProxyPassReverse /cobbler_api http://localhost:25151/ + +BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On + +# the webui is now part of the "cobbler-web" package +# and is visited at http://.../cobbler_web not this URL. +# this is only a pointer to the new page. + +<Directory "/var/www/cobbler/web/"> + Options Indexes FollowSymLinks + Order allow,deny + Allow from all +</Directory> + +<Directory "/var/www/cblr_ks/"> + Options Indexes FollowSymLinks + Order allow,deny + Allow from all +</Directory> |