delete the windows newline character

JIRA: COMPASS-7

Change-Id: Iffd549877b8cc50a995bdc59adf1f05c0fcb1d5e
Signed-off-by: baigk <baiguoku@huawei.com>

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>