Index: /branches/ipp-350_add_to_jira_conf_backups/confluence_backup.py
===================================================================
--- /branches/ipp-350_add_to_jira_conf_backups/confluence_backup.py	(revision 41060)
+++ /branches/ipp-350_add_to_jira_conf_backups/confluence_backup.py	(revision 41061)
@@ -38,4 +38,6 @@
         , ConfigSchemaLine('additional_args', False, list,
             cfg_help.SpecialSchemaProcessing.space_separated)
+        , ConfigSchemaLine('sub-dirs', False, list,
+            cfg_help.SpecialSchemaProcessing.commma_separated)
         ])
     , ConfigSchemaSection('MYSQLDUMP',
Index: /branches/ipp-350_add_to_jira_conf_backups/confluence_backup_test.py
===================================================================
--- /branches/ipp-350_add_to_jira_conf_backups/confluence_backup_test.py	(revision 41060)
+++ /branches/ipp-350_add_to_jira_conf_backups/confluence_backup_test.py	(revision 41061)
@@ -39,4 +39,5 @@
                        f"{os.path.join(tmpdir, 'rsync_source_dir2')}")
         , 'additional_args' : '-a --delete-after'
+        , 'sub-dirs' : 'conf_subdir1, conf_subdir2'
         }
     config['MYSQLDUMP'] = \
@@ -308,5 +309,5 @@
 class TestRsyncOfFiles(object):
 
-    def test_confluence_rsync(self, tmpdir):
+    def test_confluence_rsync_with_subdirs(self, tmpdir):
         """This should be similar to the regular Backup version"""
         create_items_for_full_confluence_backup_test(tmpdir)
@@ -316,10 +317,10 @@
 
         # Expected resulting rsync directories
-        expected_confluence_host_rsync1 = os.path.join(tmpdir, "host_backup_path", "rsync_source_dir1")
-        expected_confluence_bak1_rsync1 = os.path.join(tmpdir, "backup_1_path",    "rsync_source_dir1")
-        expected_confluence_bak2_rsync1 = os.path.join(tmpdir, "backup_2_path",    "rsync_source_dir1")
-        expected_confluence_host_rsync2 = os.path.join(tmpdir, "host_backup_path", "rsync_source_dir2")
-        expected_confluence_bak1_rsync2 = os.path.join(tmpdir, "backup_1_path",    "rsync_source_dir2")
-        expected_confluence_bak2_rsync2 = os.path.join(tmpdir, "backup_2_path",    "rsync_source_dir2")
+        expected_confluence_host_rsync1 = os.path.join(tmpdir, "host_backup_path", "conf_subdir1", "rsync_source_dir1")
+        expected_confluence_bak1_rsync1 = os.path.join(tmpdir, "backup_1_path",    "conf_subdir1", "rsync_source_dir1")
+        expected_confluence_bak2_rsync1 = os.path.join(tmpdir, "backup_2_path",    "conf_subdir1", "rsync_source_dir1")
+        expected_confluence_host_rsync2 = os.path.join(tmpdir, "host_backup_path", "conf_subdir2", "rsync_source_dir2")
+        expected_confluence_bak1_rsync2 = os.path.join(tmpdir, "backup_1_path",    "conf_subdir2", "rsync_source_dir2")
+        expected_confluence_bak2_rsync2 = os.path.join(tmpdir, "backup_2_path",    "conf_subdir2", "rsync_source_dir2")
         assert not os.path.exists(expected_confluence_host_rsync1)
         assert not os.path.exists(expected_confluence_bak1_rsync1)
Index: /branches/ipp-350_add_to_jira_conf_backups/jira_backup.py
===================================================================
--- /branches/ipp-350_add_to_jira_conf_backups/jira_backup.py	(revision 41060)
+++ /branches/ipp-350_add_to_jira_conf_backups/jira_backup.py	(revision 41061)
@@ -38,4 +38,6 @@
         , ConfigSchemaLine('additional_args', False, list,
             cfg_help.SpecialSchemaProcessing.space_separated)
+        , ConfigSchemaLine('sub-dirs', False, list,
+            cfg_help.SpecialSchemaProcessing.commma_separated)
         ])
     , ConfigSchemaSection('MYSQLDUMP',
Index: /branches/ipp-350_add_to_jira_conf_backups/jira_backup_test.py
===================================================================
--- /branches/ipp-350_add_to_jira_conf_backups/jira_backup_test.py	(revision 41060)
+++ /branches/ipp-350_add_to_jira_conf_backups/jira_backup_test.py	(revision 41061)
@@ -38,4 +38,5 @@
                        f"{os.path.join(tmpdir, 'rsync_source_dir2')}")
         , 'additional_args' : '-a --delete-after'
+        , 'sub-dirs' : 'jira_subdir1, jira_subdir2'
         }
     config['MYSQLDUMP'] = \
@@ -309,5 +310,5 @@
 class TestRsyncOfFiles(object):
 
-    def test_jira_rsync(self, tmpdir):
+    def test_jira_rsync_with_subdirs(self, tmpdir):
         """This should be similar to the regular Backup version"""
         create_items_for_full_jira_backup_test(tmpdir)
@@ -317,10 +318,10 @@
 
         # Expected resulting rsync directories
-        expected_jira_host_rsync1 = os.path.join(tmpdir, "host_backup_path", "rsync_source_dir1")
-        expected_jira_bak1_rsync1 = os.path.join(tmpdir, "backup_1_path",    "rsync_source_dir1")
-        expected_jira_bak2_rsync1 = os.path.join(tmpdir, "backup_2_path",    "rsync_source_dir1")
-        expected_jira_host_rsync2 = os.path.join(tmpdir, "host_backup_path", "rsync_source_dir2")
-        expected_jira_bak1_rsync2 = os.path.join(tmpdir, "backup_1_path",    "rsync_source_dir2")
-        expected_jira_bak2_rsync2 = os.path.join(tmpdir, "backup_2_path",    "rsync_source_dir2")
+        expected_jira_host_rsync1 = os.path.join(tmpdir, "host_backup_path", "jira_subdir1", "rsync_source_dir1")
+        expected_jira_bak1_rsync1 = os.path.join(tmpdir, "backup_1_path",    "jira_subdir1", "rsync_source_dir1")
+        expected_jira_bak2_rsync1 = os.path.join(tmpdir, "backup_2_path",    "jira_subdir1", "rsync_source_dir1")
+        expected_jira_host_rsync2 = os.path.join(tmpdir, "host_backup_path", "jira_subdir2", "rsync_source_dir2")
+        expected_jira_bak1_rsync2 = os.path.join(tmpdir, "backup_1_path",    "jira_subdir2", "rsync_source_dir2")
+        expected_jira_bak2_rsync2 = os.path.join(tmpdir, "backup_2_path",    "jira_subdir2", "rsync_source_dir2")
         assert not os.path.exists(expected_jira_host_rsync1)
         assert not os.path.exists(expected_jira_bak1_rsync1)
Index: /branches/ipp-350_add_to_jira_conf_backups/testing/confluence_test.config
===================================================================
--- /branches/ipp-350_add_to_jira_conf_backups/testing/confluence_test.config	(revision 41060)
+++ /branches/ipp-350_add_to_jira_conf_backups/testing/confluence_test.config	(revision 41061)
@@ -20,4 +20,5 @@
 sources = /opt/atlassian, /var/atlassian
 additional_args = -a --delete-after
+sub-dirs = conf-install, conf-home
 
 [MYSQLDUMP]
Index: /branches/ipp-350_add_to_jira_conf_backups/testing/jira_test.config
===================================================================
--- /branches/ipp-350_add_to_jira_conf_backups/testing/jira_test.config	(revision 41060)
+++ /branches/ipp-350_add_to_jira_conf_backups/testing/jira_test.config	(revision 41061)
@@ -19,4 +19,5 @@
 sources = /opt/atlassian, /var/atlassian
 additional_args = -a --delete-after
+sub-dirs = jira-install, jira-home
 
 [MYSQLDUMP]