Change generated APT sources default to someplace APT will actually look, and avoid potential name conflicts there

2 files changed, 21 insertions, 21 deletions

diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt
index 73145fd6b..606e1e128 100644
--- a/doc/server/plugins/generators/packages.txt
+++ b/doc/server/plugins/generators/packages.txt
@@ -434,7 +434,7 @@ configs.  Simply add entries like these to the appropriate bundles:
 .. code-block:: xml
 
     <Path name="/etc/yum.repos.d/bcfg2.repo"/>
-    <Path name="/etc/apt/sources.d/bcfg2"/>
+    <Path name="/etc/apt/sources.list.d/bcfg2-packages-generated-sources.list"/>
 
 If you want to change the path to either of those files, you can set
 ``yum_config`` or ``apt_config`` in ``bcfg2.conf`` to the path to the
@@ -702,25 +702,25 @@ It understands the following directives:
 [packages] section
 ------------------
 
-+-------------+------------------------------------------------------+----------+-----------------------------+
-| Name        | Description                                          | Values   | Default                     |
-+=============+======================================================+==========+=============================+
-| resolver    | Enable dependency resolution                         | Boolean  | True                        |
-+-------------+------------------------------------------------------+----------+-----------------------------+
-| metadata    | Enable metadata processing. Disabling ``metadata``   | Boolean  | True                        |
-|             | implies disabling ``resolver`` as well.              |          |                             |
-+-------------+------------------------------------------------------+----------+-----------------------------+
-| yum_config  | The path at which to generate Yum configs.           | String   | /etc/yum.repos.d/bcfg2.repo |
-+-------------+------------------------------------------------------+----------+-----------------------------+
-| apt_config  | The path at which to generate APT configs.           | String   | /etc/apt/sources.d/bcfg2    |
-+-------------+------------------------------------------------------+----------+-----------------------------+
-| gpg_keypath | The path on the client RPM GPG keys will be copied   | String   | /etc/pki/rpm-gpg            |
-|             | to before they are imported on the client.           |          |                             |
-+-------------+------------------------------------------------------+----------+-----------------------------+
-| version     | Set the version attribute used when binding Packages | any|auto | auto                        |
-+-------------+------------------------------------------------------+----------+-----------------------------+
-| cache       | Path where Packages will store its cache             | String   | <repo>/Packages/cache       |
-+-------------+------------------------------------------------------+----------+-----------------------------+
++-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
+| Name        | Description                                          | Values   | Default                                                           |
++=============+======================================================+==========+===================================================================+
+| resolver    | Enable dependency resolution                         | Boolean  | True                                                              |
++-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
+| metadata    | Enable metadata processing. Disabling ``metadata``   | Boolean  | True                                                              |
+|             | implies disabling ``resolver`` as well.              |          |                                                                   |
++-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
+| yum_config  | The path at which to generate Yum configs.           | String   | /etc/yum.repos.d/bcfg2.repo                                       |
++-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
+| apt_config  | The path at which to generate APT configs.           | String   | /etc/apt/sources.list.d/bcfg2-packages-generated-sources.list     |
++-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
+| gpg_keypath | The path on the client RPM GPG keys will be copied   | String   | /etc/pki/rpm-gpg                                                  |
+|             | to before they are imported on the client.           |          |                                                                   |
++-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
+| version     | Set the version attribute used when binding Packages | any|auto | auto                                                              |
++-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
+| cache       | Path where Packages will store its cache             | String   | <repo>/Packages/cache                                             |
++-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
 
 
 [packages:yum] section
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index 4f163a1ab..b75256318 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -18,7 +18,7 @@ from Bcfg2.Server.Plugins.Packages.PackagesSources import PackagesSources
 YUM_CONFIG_DEFAULT = "/etc/yum.repos.d/bcfg2.repo"
 
 #: The default path for generated apt configs
-APT_CONFIG_DEFAULT = "/etc/apt/sources.d/bcfg2"
+APT_CONFIG_DEFAULT = "/etc/apt/sources.list.d/bcfg2-packages-generated-sources.list"
 
 
 class Packages(Bcfg2.Server.Plugin.Plugin,