diff --git a/files/bacula/bacula-dir.conf.j2 b/files/bacula/bacula-dir.conf.j2
deleted file mode 100644
index a61ba912c7..0000000000
--- a/files/bacula/bacula-dir.conf.j2
+++ /dev/null
@@ -1,1148 +0,0 @@
-
-# Default Bacula Director Configuration file
-#
-#  The only thing that MUST be changed is to add one or more
-#   file or directory names in the Include directive of the
-#   FileSet resource.
-#
-#  For Bacula release 2.0.3 (06 March 2007) -- redhat (Zod)
-#
-#  You might also want to change the default email address
-#   from root to your address.  See the "mail" and "operator"
-#   directives in the Messages resource.
-#
-
-Director {                            # define myself
-  Name = bacula-dir
-  DIRport = 9101                # where we listen for UA connections
-  QueryFile = "/etc/bacula/query.sql"
-  WorkingDirectory = "/var/spool/bacula"
-  PidDirectory = "/var/run"
-  Maximum Concurrent Jobs = 10
-  Password = "{{ bacula5PasswordCon }}"         # Console password
-  Messages = Daemon
-}
-
-# Should catch most common files (basically pulls /)
-JobDefs {
-  Name = "LightJob"
-  Type = Backup
-  Level = Incremental
-  Client = bacula-fd 
-  FileSet = "Light Set"
-  Schedule = "WeeklyCycle"
-  Storage = TapeDrive-1
-  Messages = Standard
-  Pool = Full-Pool
-  SpoolData = yes
-  Priority = 10
-  Maximum Concurrent Jobs = 10
-}
-
-JobDefs {
-  Name = "PeopleJob"
-  Type = Backup
-  Level = Incremental
-  Client = bacula-fd 
-  FileSet = "People Set"
-  Schedule = "WeeklyCycle"
-  Storage = TapeDrive-1
-  Messages = Standard
-  Pool = Full-Pool
-  SpoolData = yes
-  Priority = 10
-  Maximum Concurrent Jobs = 10
-}
-
-
-JobDefs {
-  Name = "PuppetJob"
-  Type = Backup
-  Level = Incremental
-  Client = bacula-fd 
-  FileSet = "Puppet Set"
-  Schedule = "WeeklyCycle"
-  Storage = TapeDrive-1
-  Messages = Standard
-  Pool = Full-Pool
-  SpoolData = yes
-  Priority = 10
-  Maximum Concurrent Jobs = 10
-}
-
-# Should catch most common files (basically pulls /)
-JobDefs {
-  Name = "DefaultJob"
-  Type = Backup
-  Level = Incremental
-  Client = bacula-fd 
-  FileSet = "Full Set"
-  Schedule = "WeeklyCycle"
-  Storage = TapeDrive-1
-  Messages = Standard
-  Pool = Full-Pool
-  SpoolData = yes
-  Priority = 10
-  Maximum Concurrent Jobs = 10
-}
-# job for log servers. 
-JobDefs {
-  Name = "DefaultLogJob"
-  Type = Backup
-  Level = Incremental
-  Client = bacula-fd 
-  FileSet = "Full Log Set"
-  Schedule = "WeeklyCycle"
-  Storage = TapeDrive-1
-  Messages = Standard
-  Pool = Full-Pool
-  SpoolData = yes
-  Priority = 10
-  Maximum Concurrent Jobs = 10
-}
-
-# For the CVS/GIT box
-JobDefs {
-  Name = "SCMJob"
-  Type = Backup
-  Level = Incremental
-  Client = bacula-fd 
-  FileSet = "SCM Set"
-  Schedule = "WeeklyCycle"
-  Storage = TapeDrive-1
-  Messages = Standard
-  Pool = Full-Pool
-  SpoolData = yes
-# Full Backup Pool = Full-Pool
-# Incremental Backup Pool = Inc-Pool
-# Differential Backup Pool = Diff-Pool
-  Priority = 10
-  Maximum Concurrent Jobs = 10
-}
-
-
-# Should catch most common files (basically pulls /)
-JobDefs {
-  Name = "CatalogJob"
-  Type = Backup
-  Level = Incremental
-  Client = bacula-fd 
-  FileSet = "Full Set"
-  Schedule = "WeeklyCycle"
-  Storage = TapeDrive-1
-  Messages = Standard
-  Pool = Full-Pool
-  SpoolData = yes
-# Full Backup Pool = Full-Pool-Catalog
-  Priority = 10
-  Maximum Concurrent Jobs = 10
-}
-
-# For the koji mount
-
-#Job {
-#   Name = "fedorapeople.org"
-#   Client = "fedorapeople.org"
-#   JobDefs = "DefaultJob"
-#   Write Bootstrap = "/var/spool/bacula/fedorapeople.org.bsr"
-#}
-
-Job {
-   Name = "db05"
-   Client = "db05"
-   JobDefs = "DefaultJob"
-   Write Bootstrap = "/var/spool/bacula/db05.bsr"
-}
-
-Job {
-   Name = "db01"
-   Client = "db01"
-   JobDefs = "DefaultJob"
-   Write Bootstrap = "/var/spool/bacula/db02.bsr"
-}
-
-Job {
-   Name = "db-fas01"
-   Client = "db-fas01"
-   JobDefs = "DefaultJob"
-   Write Bootstrap = "/var/spool/bacula/db-fas01.bsr"
-}
-
-#Job {
-#   Name = "db02"
-#   Client = "db02"
-#   JobDefs = "DefaultJob"
-#   Write Bootstrap = "/var/spool/bacula/db02.bsr"
-#}
-
-Job {
-   Name = "db04"
-   Client = "db04"
-   JobDefs = "DefaultJob"
-   Write Bootstrap = "/var/spool/bacula/db04.bsr"
-}
-
-Job {
-   Name = "fas01"
-   Client = "fas01"
-   JobDefs = "DefaultJob"
-   Write Bootstrap = "/var/spool/bacula/fas01.bsr"
-}
-
-#Job {
-#   Name = "cvs1"
-#   Client = "cvs1"
-#   JobDefs = "SCMJob"
-#   Write Bootstrap = "/var/spool/bacula/cvs1.bsr"
-#}
-
-Job {
-   Name = "pkgs01"
-   Client = "pkgs01"
-   JobDefs = "SCMJob"
-   Write Bootstrap = "/var/spool/bacula/pkgs01.bsr"
-}
-
-Job {
-   Name = "collab04"
-   Client = "collab04"
-   JobDefs = "LightJob"
-   Write Bootstrap = "/var/spool/bacula/collab04.bsr"
-}
-
-
-Job {
-   Name = "hosted-lists01"
-   Client = "hosted-lists01"
-   JobDefs = "LightJob"
-   Write Bootstrap = "/var/spool/bacula/hosted-lists01.bsr"
-}
-
-Job {
-   Name = "hosted04"
-   Client = "hosted04"
-   JobDefs = "LightJob"
-   Write Bootstrap = "/var/spool/bacula/hosted04.bsr"
-}
-
-#Job {
-#   Name = "hosted04"
-#   Client = "hosted04"
-#   JobDefs = "LightJob"
-#   Write Bootstrap = "/var/spool/bacula/hosted04.bsr"
-#}
-
-Job {
-   Name = "noc01"
-   Client = "noc01"
-   JobDefs = "LightJob"
-   Write Bootstrap = "/var/spool/bacula/noc01.bsr"
-}
-
-Job {
-   Name = "lockbox01"
-   Client = "lockbox01"
-   JobDefs = "PuppetJob"
-   Write Bootstrap = "/var/spool/bacula/lockbox01.bsr"
-}
-
-Job {
-   Name = "ask01"
-   Client = "ask01"
-   JobDefs = "LightJob"
-   Write Bootstrap = "/var/spool/bacula/ask01.bsr"
-}
-
-Job {
-   Name = "bastion01"
-   Client = "bastion01"
-   JobDefs = "LightJob"
-   Write Bootstrap = "/var/spool/bacula/bastion01.bsr"
-}
-
-Job {
-   Name = "bastion02"
-   Client = "bastion02"
-   JobDefs = "LightJob"
-   Write Bootstrap = "/var/spool/bacula/bastion02.bsr"
-}
-
-
-Job {
-   Name = "proxy01"
-   Client = "proxy01"
-   JobDefs = "LightJob"
-   Write Bootstrap = "/var/spool/bacula/proxy01.bsr"
-}
-
-
-Job {
-   Name = "proxy02"
-   Client = "proxy02"
-   JobDefs = "LightJob"
-   Write Bootstrap = "/var/spool/bacula/proxy02.bsr"
-}
-
-#Job {
-#   Name = "people02"
-#   Client = "people02"
-#   JobDefs = "PeopleJob"
-#   Write Bootstrap = "/var/spool/bacula/people02.bsr"
-#}
-
-Job {
-   Name = "people03"
-   Client = "people03"
-   JobDefs = "PeopleJob"
-   Write Bootstrap = "/var/spool/bacula/people03.bsr"
-}
-
-Job {
-   Name = "releng04"
-   Client = "releng04"
-   JobDefs = "DefaultJob"
-   Write Bootstrap = "/var/spool/bacula/releng04.bsr"
-}
-
-Job {
-   Name = "relepel01"
-   Client = "relepel01"
-   JobDefs = "DefaultJob"
-   Write Bootstrap = "/var/spool/bacula/relepel01.bsr"
-}
-
-#Job {
-#   Name = "koji"
-#   Client = "nfs01"
-#   JobDefs = "KojiJob"
-#   Write Bootstrap = "/var/spool/bacula/koji.bsr"
-#}
-
-Job {
-   Name = "log02"
-   Client = "log02"
-   JobDefs = "DefaultLogJob"
-   Write Bootstrap = "/var/spool/bacula/log02.bsr"
-}
-
-#Job {
-#   Name = "backup03"
-#   Client = "backup03"
-#   JobDefs = "LightJob"
-#   Write Bootstrap = "/var/spool/bacula/backup03.bsr"
-#}
-
-# Backup the catalog database (after the nightly save)
-Job {
-  Name = "BackupCatalog"
-  JobDefs = "CatalogJob"
-  Level = Full
-  FileSet="Catalog"
-  Schedule = "WeeklyCycleAfterBackup"
-  # This creates an ASCII copy of the catalog
-  RunBeforeJob = "/usr/local/bin/fedora_make_catalog_backup"
-  # This deletes the copy of the catalog
-  RunAfterJob  = "/usr/local/bin/fedora_delete_catalog_backup"
-  Write Bootstrap = "/var/spool/bacula/BackupCatalog.bsr"
-  Priority = 11                   # run after main backup
-}
-
-#
-# Standard Restore template, to be changed by Console program
-#  Only one such job is needed for all Jobs/Clients/Storage ...
-#
-Job {
-  Name = "RestoreFiles"
-  Type = Restore
-  Client=bacula-fd                 
-  FileSet="Full Set"                  
-  Storage = TapeDrive-1               
-  Pool = Default
-#  Full Backup Pool = Full-Pool
-#  Incremental Backup Pool = Inc-Pool
-#  Differential Backup Pool = Diff-Pool
-  Messages = Standard
-  Where = /tmp/bacula-restores
-}
-
-
-
-FileSet {
-  Name = "Light Set"
-  Include {
-    Options {
-      signature = SHA1
-      Compression = GZIP9
-    }
-    File = /etc
-    File = /root
-    File = /home
-    File = /var
-    File = /srv
-  }
-  Exclude {
-    File = /proc
-    File = /tmp
-    File = /.journal
-    File = /.fsck
-    File = /dev
-    File = /sys
-    File = /.swap
-    File = /srv/torrent/btholding
-    File = /srv/web/docroot/epel
-    File = /srv/rpmbuild/epel
-    File = /srv/gitweb-cache
-    File = /var/tmp
-    File = /glusterfs
-  }
-}
-
-FileSet {
-  Name = "People Set"
-  Include {
-    Options {
-      signature = SHA1
-      Compression = GZIP9
-    }
-    File = /etc
-    File = /root
-    File = /var
-    File = /srv
-  }
-  Exclude {
-    File = /proc
-    File = /tmp
-    File = /.journal
-    File = /.fsck
-    File = /dev
-    File = /sys
-    File = /.swap
-    File = /srv/torrent/btholding
-    File = /var/tmp
-  }
-}
-
-FileSet {
-  Name = "Puppet Set"
-  Include {
-    Options {
-      signature = SHA1
-      Compression = GZIP9
-      WildDir=.snapshot
-      Exclude=yes
-    }
-    File = /etc
-    File = /root
-    File = /home
-    File = /var
-    File = /srv
-    File = /git
-    File = /mnt/fedora/app
-    File = /mnt/fedora/cvs
-  }
-  Exclude {
-    File = /proc
-    File = /tmp
-    File = /.journal
-    File = /.fsck
-    File = /dev
-    File = /sys
-    File = /.swap
-    File = /mnt/fedora/app/fi-repo/rhel
-    File = /var/tmp
-  }
-}
-
-FileSet {
-  Name = "SCM Set"
-  Include {
-    Options {
-      signature = SHA1
-      Compression = GZIP9
-    }
-    File = /
-    File = /srv
-    File = /srv/cache/lookaside/
-  }
-  Exclude {
-    File = /proc
-    File = /tmp
-    File = /.journal
-    File = /.fsck
-    File = /dev
-    File = /sys
-    File = /.swap
-    File = /var/tmp
-    File = /srv/gitweb-cache
-  }
-}
-
-
-# List of files to be backed up
-FileSet {
-  Name = "Full Set"
-  Include {
-    Options {
-      Compression = GZIP9
-      signature = SHA1
-    }
-
-#    
-#  Put your list of files here, preceded by 'File =', one per line
-#    or include an external list with:
-#
-#    File = <file-name
-#
-#  Note: / backs up everything on the root partition.
-#    if you have other partitons such as /usr or /home
-#    you will probably want to add them too.
-#
-#  This File-directive would backup your whole filesystem.
-#    It is disabled by default
-#
-    File = /
-    File = /boot
-  }
-
-#
-# If you backup the root directory, the following two excluded
-#   files can be useful
-#
-  Exclude {
-    File = /proc
-    File = /tmp
-    File = /.journal
-    File = /.fsck
-    File = /dev
-    File = /sys
-    File = /.swap
-    File = /var/lib/pgsql/data
-    File = /var/lib/mysql
-    File = /var/tmp
-    File = /srv/gitweb-cache
-  }
-}
-#
-# Set for log servers. 
-#
-FileSet {
-  Name = "Full Log Set"
-  Include {
-    Options {
-      Compression = GZIP9
-      signature = SHA1
-    }
-
-#    
-#  Put your list of files here, preceded by 'File =', one per line
-#    or include an external list with:
-#
-#    File = <file-name
-#
-#  Note: / backs up everything on the root partition.
-#    if you have other partitons such as /usr or /home
-#    you will probably want to add them too.
-#
-#  This File-directive would backup your whole filesystem.
-#    It is disabled by default
-#
-    File = /
-    File = /boot
-    File = /var/log
-  }
-
-#
-# If you backup the root directory, the following two excluded
-#   files can be useful
-#
-  Exclude {
-    File = /proc
-    File = /tmp
-    File = /.journal
-    File = /.fsck
-    File = /dev
-    File = /sys
-    File = /.swap
-    File = /var/lib/pgsql/data
-    File = /var/lib/mysql
-    File = /var/tmp
-    File = /srv/gitweb-cache
-  }
-}
-
-
-# Monthly backups for koji
-Schedule {
-  Name = "MonthlyCycle"
-  Run = Full 1st sun at 23:05
-  Run = level=Incremental 2nd-5th sun at 20:05
-#  Run = Differential 2nd-5th sun at 23:05
-#  Run = Incremental mon-sat at 23:05
-#   Run = level=Full sat at 22:05
-#   Run = level=Incremental sun-fri at 22:05
-}
-
-#
-# When to do the backups, full backup on first sunday of the month,
-#  differential (i.e. incremental since full) every other sunday,
-#  and incremental backups other days
-Schedule {
-  Name = "WeeklyCycle"
-#  Run = Full 1st sun at 23:05
-#  Run = Differential 2nd-5th sun at 23:05
-#  Run = Incremental mon-sat at 23:05
-   Run = level=Full sat at 22:05
-   Run = level=Incremental sun-fri at 22:05
-}
-
-# This schedule does the catalog. It starts after the WeeklyCycle
-Schedule {
-  Name = "WeeklyCycleAfterBackup"
-  Run = Full sun-sat at 22:10
-}
-
-# This is the backup of the catalog
-FileSet {
-  Name = "Catalog"
-  Include {
-    Options {
-      signature = MD5
-    }
-    File = /bacula/bacula.sql
-  }
-}
-
-# Client (File Services) to backup
-Client {
-  Name = bacula-fd
-  Address = backup03.phx2.fedoraproject.org
-  FDPort = 9102
-  Catalog = backup03
-  Password = "{{ bacula5PasswordDir }}"          # password for FileDaemon
-  File Retention = 90 days            # 30 days
-  Job Retention = 365 days            # six months
-  AutoPrune = yes                     # Prune expired Jobs/Files
-  Maximum Concurrent Jobs = 10
-}
-
-#
-# Second Client (File Services) to backup
-#  You should change Name, Address, and Password before using
-#
-
-#Client {
-#    Name = fedorapeople.org
-#    Address = fedorapeople.org
-#    FDPort = 9102
-#    Catalog = backup03
-#    Password = "{{ bacula5PasswordDir }}"
-#    File Retention = 15 days
-#    Job Retention = 20 days
-#    AutoPrune = Yes
-#}
-
-
-Client {
-    Name = db05
-    Address = db05.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = db01
-    Address = db01.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = db02
-    Address = db02.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = db04
-    Address = db04.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = fas01
-    Address = fas01.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = db-fas01
-    Address = db-fas01.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-#Client {
-#    Name = cvs1
-#    Address = 10.5.127.37
-#    FDPort = 9102
-#    Catalog = backup03
-#    Password = "{{ bacula5PasswordDir }}"
-#    File Retention = 13 days
-#    Job Retention = 20 days
-#    AutoPrune = Yes
-#    Maximum Concurrent Jobs = 10
-#}
-
-Client {
-    Name = pkgs01
-    Address = 10.5.125.44
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-
-Client {
-    Name = collab03
-    Address = collab03.vpn.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = collab04
-    Address = collab04.vpn.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = hosted04
-    Address = hosted04.vpn.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = hosted03
-    Address = hosted03.vpn.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = hosted-lists01
-    Address = hosted-lists01.vpn.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = noc01
-    Address = noc01.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = lockbox01
-    Address = lockbox01.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = ask01
-    Address = ask01.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = bastion01
-    Address = bastion01.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = bastion02
-    Address = bastion02.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = proxy01
-    Address = proxy01.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-
-Client {
-    Name = proxy02
-    Address = proxy02.vpn.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = people01
-    Address = people01.vpn.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = people02
-    Address = people02.vpn.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = people03
-    Address = people03.vpn.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = releng02
-    Address = 10.5.127.54
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = releng04
-    Address = releng04.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = relepel01
-    Address = 10.5.125.65
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-
-
-Client {
-    Name = nfs01
-    Address = nfs01.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-Client {
-    Name = log02
-    Address = log02.phx2.fedoraproject.org
-    FDPort = 9102
-    Catalog = backup03
-    Password = "{{ bacula5PasswordDir }}"
-    File Retention = 90 days
-    Job Retention = 365 days
-    AutoPrune = Yes
-    Maximum Concurrent Jobs = 10
-}
-
-#Client {
-#    Name = backup03
-#    Address = localhost
-#    FDPort = 9102
-#    Catalog = backup03
-#    Password = "{{ bacula5PasswordDir }}"
-#    File Retention = 15 days
-#    Job Retention = 20 days
-#    AutoPrune = Yes
-#    Maximum Concurrent Jobs = 10
-#}
-
-# Definition of file storage device
-Storage {
-  Name = File
-# Do not use "localhost" here    
-  Address = backup03
-  SDPort = 9103
-  Password = "{{ bacula5PasswordDir }}"
-  Device = FileStorage
-  Media Type = File
-  Maximum Concurrent Jobs = 10
-}
-
-
-Storage {
-  Name = TapeDrive-1
-# Do not use "localhost" here    
-  Address = backup03
-  SDPort = 9103
-  Password = "{{ bacula5PasswordDir }}"
-  Device = Autochanger
-  Media Type = LTO-5
-  Autochanger = yes
-  Maximum Concurrent Jobs = 10
-}
-
-
-# Generic catalog service
-Catalog {
-  Name = backup03
-  dbname = bacula; user = root; password = ""
-}
-
-# Reasonable message delivery -- send most everything to email address
-#  and to the console
-Messages {
-  Name = Standard
-#
-# NOTE! If you send to two email or more email addresses, you will need
-#  to replace the %r in the from field (-f part) with a single valid
-#  email address in both the mailcommand and the operatorcommand.
-#  What this does is, it sets the email address that emails would display
-#  in the FROM field, which is by default the same email as they're being
-#  sent to.  However, if you send email to more than one address, then
-#  you'll have to set the FROM address manually, to a single address. 
-#  for example, a 'no-reply@mydomain.com', is better since that tends to
-#  tell (most) people that its coming from an automated source.
-
-#
-  mailcommand = "/usr/sbin/bsmtp -h bastion -f \"\(Bacula\) %r\" -s \"[backup03] Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "/usr/sbin/bsmtp -h bastion -f \"\(Bacula\) %r\" -s \"[backup03] Bacula: Intervention needed for %j\" %r"
-  mail = sysadmin-backup-members@fedoraproject.org = all, !skipped            
-  operator = sysadmin-backup-members@fedoraproject.org = mount
-  console = all, !skipped, !saved
-#
-# WARNING! the following will create a file that you must cycle from
-#          time to time as it will grow indefinitely. However, it will
-#          also keep all your messages if they scroll off the console.
-#
-  append = "/var/spool/bacula/log" = all, !skipped
-}
-
-
-#
-# Message delivery for daemon messages (no job).
-Messages {
-  Name = Daemon
-  mailcommand = "/usr/sbin/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-  mail = mmcgrath@redhat.com = all, !skipped            
-  console = all, !skipped, !saved
-  append = "/var/log/bacula.log" = all, !skipped
-}
-
-
-
-    
-# Default pool definition
-Pool {
-  Name = Default
-  Pool Type = Backup
-  Recycle = yes                       # Bacula can automatically recycle Volumes
-  AutoPrune = yes                     # Prune expired volumes
-  Cleaning Prefix = CLNU
-#  Volume Retention = 20h              # 12 hours
-#  Use Volume Once = yes
-}
-
-Pool {
-  Name = Full-Pool
-  Pool Type = Backup
-  Recycle = yes
-  AutoPrune = yes
-  Volume Retention = 20 days
-#  Use Volume Once = yes
-#  Accept Any Volume = yes
-#  Maximum Volume Jobs = 1
-#  Label Format = "Full-${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}-"
-# Maximum Volumes = 2
-#  VolumeUseDuration = 6d
-  Cleaning Prefix = CLNU
-}
-
-Pool {
-  Name = Diff-Pool
-  Pool Type = Backup
-  Recycle = yes
-  AutoPrune = yes
-  Volume Retention = 20 days
-#  Use Volume Once = yes
-#  Accept Any Volume = yes
-#  Maximum Volume Jobs = 1
-# Label Format = "Diff-${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}-"
-#  Maximum Volumes = 10
-}
-
-Pool {
-  Name = Inc-Pool
-  Pool Type = Backup
-  Recycle = yes
-  AutoPrune = yes
-  Volume Retention = 12 days
-#  Use Volume Once = yes
-#  Accept Any Volume = yes
-#  Maximum Volume Jobs = 1
-# Label Format = "Inc-${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}-"
-# Maximum Volumes = 13
-  VolumeUseDuration = 20h
-}
-
-Pool {
-  Name = Full-Pool-Catalog
-  Pool Type = Backup
-  Recycle = yes
-  AutoPrune = yes
-  Volume Retention = 8 days
-#  Use Volume Once = yes
-#  Accept Any Volume = yes
-#  Maximum Volume Jobs = 1
-# Label Format = "FullCatalog-${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}-"
-# Maximum Volumes = 14
-  VolumeUseDuration = 20h
-}
-
-
-
-#
-# Restricted console used by tray-monitor to get the status of the director
-#
-Console {
-  Name = bacula-mon
-  Password = "{{ bacula5PasswordDir }}"
-  CommandACL = status, .status
-}
diff --git a/files/bacula/bacula-fd.conf.j2 b/files/bacula/bacula-fd.conf.j2
deleted file mode 100644
index 5cb5a29eb2..0000000000
--- a/files/bacula/bacula-fd.conf.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Default  Bacula File Daemon Configuration file
-#
-#  For Bacula release 2.0.3 (06 March 2007) -- redhat (Zod)
-#
-# There is not much to change here except perhaps the
-# File daemon Name to
-#
-
-#
-# List Directors who are permitted to contact this File daemon
-#
-Director {
-  Name = bacula-dir
-  Password = "{{ bacula5PasswordDir }}"
-}
-
-#
-# Restricted Director, used by tray-monitor to get the
-#   status of the file daemon
-#
-Director {
-  Name = bacula-mon
-  Password = "{{ bacula5PasswordDir }}"
-  Monitor = yes
-}
-
-#
-# "Global" File daemon configuration specifications
-#
-FileDaemon {                          # this is me
-  Name = bacula-fd
-  FDport = 9102                  # where we listen for the director
-  WorkingDirectory = /var/spool/bacula
-  Pid Directory = /var/run
-  Maximum Concurrent Jobs = 10
-  Heartbeat Interval = 10
-  #Maximum Network Buffer Size = 131072
-}
-
-# Send all messages except skipped files back to Director
-Messages {
-  Name = Standard
-  director = bacula-dir = all, !skipped, !restored
-}
diff --git a/files/bacula/bacula-sd.conf.j2 b/files/bacula/bacula-sd.conf.j2
deleted file mode 100644
index 127f2f4d48..0000000000
--- a/files/bacula/bacula-sd.conf.j2
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Default Bacula Storage Daemon Configuration file
-#
-#  For Bacula release 2.0.3 (06 March 2007) -- redhat (Zod)
-#
-# You may need to change the name of your tape drive
-#   on the "Archive Device" directive in the Device
-#   resource.  If you change the Name and/or the 
-#   "Media Type" in the Device resource, please ensure
-#   that dird.conf has corresponding changes.
-#
-
-Storage {                             # definition of myself
-  Name = bacula-sd
-  SDPort = 9103                  # Director's port      
-  WorkingDirectory = "/var/spool/bacula"
-  Pid Directory = "/var/run"
-  Maximum Concurrent Jobs = 10
-  Heartbeat Interval = 5
-}
-
-#
-# List Directors who are permitted to contact Storage daemon
-#
-Director {
-  Name = bacula-dir
-  Password = "{{ bacula5PasswordDir }}"
-}
-
-#
-# Restricted Director, used by tray-monitor to get the
-#   status of the storage daemon
-#
-Director {
-  Name = bacula-mon
-  Password = "{{ bacula5PasswordDir }}"
-  Monitor = yes
-}
-
-#
-# Devices supported by this Storage daemon
-# To connect, the Director's bacula-dir.conf must have the
-#  same Name and MediaType. 
-#
-
-Device {
-  Name = FileStorage
-  Media Type = File
-  Archive Device = /bacula/
-  LabelMedia = yes;                   # lets Bacula label unlabeled media
-  Random Access = Yes;
-  AutomaticMount = yes;               # when device opened, read it
-  RemovableMedia = no;
-  AlwaysOpen = no;
-}
-
-
-Device {
-  Name = FileStorage2
-  Media Type = File
-  Archive Device = /bacula2/
-  LabelMedia = yes;                   # lets Bacula label unlabeled media
-  Random Access = Yes;
-  AutomaticMount = yes;               # when device opened, read it
-  RemovableMedia = no;
-  AlwaysOpen = no;
-}
-
-#
-# An autochanger device with two drives
-
-Autochanger {
-  Name = Autochanger
-  Device = Drive-1
-  Changer Command = "/usr/libexec/bacula/mtx-changer %c %o %S %a %d"
-  Changer Device = /dev/sg1
-}
-
-Device {
-  Name = Drive-1                      #
-  Drive Index = 0
-  Media Type = LTO-5
-  Archive Device = /dev/nst0
-  AutomaticMount = yes;               # when device opened, read it
-  AlwaysOpen = yes;
-  RemovableMedia = yes;
-  RandomAccess = no;
-  AutoChanger = yes
-  SpoolDirectory = /bacula/bacula/spool/;
-  Maximum Spool Size = 1600G;
-#  Label Media = yes
-  # Enable the Alert command only if you have the mtx package loaded
-  Alert Command = "sh -c 'tapeinfo -f %c |grep TapeAlert|cat'"
-  # If you have smartctl, enable this, it has more info than tapeinfo 
-  Alert Command = "sh -c 'smartctl -H -l error %c'"  
-}
-# 
-# Send all messages to the Director, 
-# mount messages also are sent to the email address
-#
-Messages {
-  Name = Standard
-  director = bacula-dir = all
-}
diff --git a/files/bacula/bconsole.conf.j2 b/files/bacula/bconsole.conf.j2
deleted file mode 100644
index 3c46b83d26..0000000000
--- a/files/bacula/bconsole.conf.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Bacula User Agent (or Console) Configuration File
-#
-
-Director {
-  Name = bacula-dir
-  DIRport = 9101
-  address = localhost
-  Password = "{{ bacula5PasswordCon }}"
-}
diff --git a/files/bacula/fedora_delete_catalog_backup b/files/bacula/fedora_delete_catalog_backup
deleted file mode 100755
index 7f7a760fed..0000000000
--- a/files/bacula/fedora_delete_catalog_backup
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-#
-# This script deletes a catalog dump
-#
-rm -f /bacula/bacula.sql
diff --git a/files/bacula/fedora_make_catalog_backup b/files/bacula/fedora_make_catalog_backup
deleted file mode 100755
index 5a6d38340c..0000000000
--- a/files/bacula/fedora_make_catalog_backup
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rm -f /bacula/bacula.sql
-/usr/bin/mysqldump -u bacula -f bacula > /bacula/bacula.sql
diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml
index 54e82f8f02..5fdb70786d 100644
--- a/handlers/restart_services.yml
+++ b/handlers/restart_services.yml
@@ -11,15 +11,6 @@
 - name: reload apache
   action: service name=httpd state=reloaded
 
-- name: restart bacula-fd
-  action: service name=bacula-fd state=restarted
-
-- name: restart bacula-sd
-  action: service name=bacula-sd state=restarted
-
-- name: restart bacula-dir
-  action: service name=bacula-dir state=restarted
-
 - name: restart collectd
   action: service name=collectd state=restarted
 
diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml
index 8d9b30ee72..410f4e540b 100644
--- a/playbooks/groups/backup-server.yml
+++ b/playbooks/groups/backup-server.yml
@@ -27,7 +27,6 @@
   - include: "{{ tasks }}/2fa_client.yml"
   - include: "{{ tasks }}/motd.yml"
   - include: "{{ tasks }}/sudo.yml"
-  - include: "{{ tasks }}/mysql_server.yml"
   - include: "{{ tasks }}/rdiff_backup_server.yml"
 
   - name: Create GNOME backup user