WIP: Set up ejabberd for kosmos.org #9

Closed
greg wants to merge 24 commits from feature/7-ejabberd into master
3 changed files with 10 additions and 4 deletions
Showing only changes of commit 8f95c220f5 - Show all commits
+2
View File
@@ -8,3 +8,5 @@ name "backup"
depends 'logrotate' depends 'logrotate'
depends 'mysql' depends 'mysql'
depends 'postgresql'
depends 'build-essential'
+5 -1
View File
@@ -23,8 +23,12 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
build_essential 'backup gem'
package ["ruby", "ruby-dev"]
gem_package 'backup' do gem_package 'backup' do
version '4.4.0' version '5.0.0.beta.2'
end end
backup_data = Chef::EncryptedDataBagItem.load('credentials', 'backup') backup_data = Chef::EncryptedDataBagItem.load('credentials', 'backup')
@@ -1,7 +1,7 @@
# encoding: utf-8 # encoding: utf-8
## ##
# Backup v4.x Configuration # Backup v5.x Configuration
# #
# Documentation: http://backup.github.io/backup # Documentation: http://backup.github.io/backup
# Issue Tracker: https://github.com/backup/backup/issues # Issue Tracker: https://github.com/backup/backup/issues
@@ -56,8 +56,8 @@ end
<%- if node["backup"]["postgresql"] -%> <%- if node["backup"]["postgresql"] -%>
Database::PostgreSQL.defaults do |db| Database::PostgreSQL.defaults do |db|
db.username = "<%= node["backup"]["postgresql"]["username"] %>" db.username = "postgres"
db.password = "<%= node["backup"]["postgresql"]["password"] %>" db.password = "<%= node['postgresql']['password']['postgres'] %>"
db.host = "<%= node["backup"]["postgresql"]["host"] %>" db.host = "<%= node["backup"]["postgresql"]["host"] %>"
db.port = "<%= node["backup"]["postgresql"]["port"] %>" db.port = "<%= node["backup"]["postgresql"]["port"] %>"
# db.socket = "/var/run/postgresql/.s.PGSQL.5432" # db.socket = "/var/run/postgresql/.s.PGSQL.5432"