Switch from Batali to Berkshelf to manage upstream cookbooks

This commit is contained in:
Greg Karékinian
2018-04-17 12:15:43 +02:00
parent 0c80aaabd4
commit d3aa94aab5
62 changed files with 943 additions and 2560 deletions

View File

@@ -1,9 +0,0 @@
# 0.1.0
Initial release of mediawiki
* Enhancements
* an enhancement
* Bug Fixes
* a bug fix

View File

@@ -1,88 +0,0 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"
Vagrant.require_version ">= 1.5.0"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# All Vagrant configuration is done here. The most common configuration
# options are documented and commented below. For a complete reference,
# please see the online documentation at vagrantup.com.
config.vm.hostname = "mediawiki-berkshelf"
# Set the version of chef to install using the vagrant-omnibus plugin
config.omnibus.chef_version = :latest
# Every Vagrant virtual environment requires a box to build off of.
# If this value is a shorthand to a box in Vagrant Cloud then
# config.vm.box_url doesn't need to be specified.
config.vm.box = "chef/ubuntu-14.04"
# The url from where the 'config.vm.box' box will be fetched if it
# is not a Vagrant Cloud box and if it doesn't already exist on the
# user's system.
# config.vm.box_url = "https://vagrantcloud.com/chef/ubuntu-14.04/version/1/provider/virtualbox.box"
# Assign this VM to a host-only network IP, allowing you to access it
# via the IP. Host-only networks can talk to the host machine as well as
# any other machines on the same network, but cannot be accessed (through this
# network interface) by any external networks.
config.vm.network :private_network, type: "dhcp"
# Create a forwarded port mapping which allows access to a specific port
# within the machine from a port on the host machine. In the example below,
# accessing "localhost:8080" will access port 80 on the guest machine.
# Share an additional folder to the guest VM. The first argument is
# the path on the host to the actual folder. The second argument is
# the path on the guest to mount the folder. And the optional third
# argument is a set of non-required options.
# config.vm.synced_folder "../data", "/vagrant_data"
# Provider-specific configuration so you can fine-tune various
# backing providers for Vagrant. These expose provider-specific options.
# Example for VirtualBox:
#
# config.vm.provider :virtualbox do |vb|
# # Don't boot with headless mode
# vb.gui = true
#
# # Use VBoxManage to customize the VM. For example to change memory:
# vb.customize ["modifyvm", :id, "--memory", "1024"]
# end
#
# View the documentation for the provider you're using for more
# information on available options.
# The path to the Berksfile to use with Vagrant Berkshelf
# config.berkshelf.berksfile_path = "./Berksfile"
# Enabling the Berkshelf plugin. To enable this globally, add this configuration
# option to your ~/.vagrant.d/Vagrantfile file
config.berkshelf.enabled = true
# An array of symbols representing groups of cookbook described in the Vagrantfile
# to exclusively install and copy to Vagrant's shelf.
# config.berkshelf.only = []
# An array of symbols representing groups of cookbook described in the Vagrantfile
# to skip installing and copying to Vagrant's shelf.
# config.berkshelf.except = []
config.vm.provision :chef_solo do |chef|
chef.json = {
mysql: {
server_root_password: 'rootpass',
server_debian_password: 'debpass',
server_repl_password: 'replpass'
}
}
chef.run_list = [
"recipe[mediawiki::default]"
]
end
end

View File

@@ -0,0 +1,147 @@
{
"name": "mediawiki",
"description": "Installs/Configures mediawiki",
"long_description": "Installs/Configures mediawiki",
"maintainer": "pulsation",
"maintainer_email": "YOUR_EMAIL",
"license": "BSD",
"platforms": {
"centos": ">= 0.0.0",
"debian": ">= 0.0.0"
},
"dependencies": {
"apache2": ">= 0.0.0",
"php": ">= 0.0.0",
"mysql": ">= 0.0.0",
"database": ">= 0.0.0",
"chef_nginx": ">= 0.0.0",
"mysql2_chef_gem": ">= 0.0.0",
"php-fpm": ">= 0.0.0"
},
"recommendations": {
},
"suggestions": {
},
"conflicting": {
},
"providing": {
},
"replacing": {
},
"attributes": {
"mediawiki/version": {
"display_name": "Mediawiki version",
"type": "string",
"required": "recommended",
"choice": [
],
"calculated": false,
"recipes": [
]
},
"mediawiki/database/name": {
"display_name": "Database name",
"type": "string",
"required": "optional",
"choice": [
],
"calculated": false,
"recipes": [
]
},
"mediawiki/database/user": {
"display_name": "Database user",
"type": "string",
"required": "optional",
"choice": [
],
"calculated": false,
"recipes": [
]
},
"mediawiki/database/password": {
"display_name": "Database password",
"type": "string",
"required": "optional",
"choice": [
],
"calculated": false,
"recipes": [
]
},
"mediawiki/server_name": {
"display_name": "Server name",
"type": "string",
"required": "recommended",
"choice": [
],
"calculated": false,
"recipes": [
]
},
"mediawiki/sciptpath": {
"display_name": "Script path",
"type": "string",
"required": "optional",
"choice": [
],
"calculated": false,
"recipes": [
]
},
"mediawiki/admin_user": {
"display_name": "Admin user",
"type": "string",
"required": "recommended",
"choice": [
],
"calculated": false,
"recipes": [
]
},
"mediawiki/admin_password": {
"display_name": "Admin password",
"type": "string",
"required": "recommended",
"choice": [
],
"calculated": false,
"recipes": [
]
}
},
"groupings": {
},
"recipes": {
"mediawiki::default": "Installs/Configures mediawiki"
},
"version": "0.3.0",
"source_url": "",
"issues_url": "",
"privacy": false,
"chef_versions": [
],
"ohai_versions": [
],
"gems": [
]
}

View File

@@ -1,59 +0,0 @@
name 'mediawiki'
maintainer 'pulsation'
license 'BSD'
description 'Installs/Configures mediawiki'
long_description 'Installs/Configures mediawiki'
version '0.3.0'
depends 'apache2'
depends 'php'
depends 'mysql'
depends 'database'
depends 'chef_nginx'
depends 'mysql2_chef_gem'
depends 'php-fpm'
attribute 'mediawiki/version',
:display_name => "Mediawiki version",
:type => "string",
:required => "recommended"
attribute 'mediawiki/database/name',
:display_name => "Database name",
:type => "string",
:required => "optional"
attribute 'mediawiki/database/user',
:display_name => "Database user",
:type => "string",
:required => "optional"
attribute 'mediawiki/database/password',
:display_name => "Database password",
:type => "string",
:required => "optional"
attribute 'mediawiki/server_name',
:display_name => "Server name",
:type => "string",
:required => "recommended"
attribute 'mediawiki/sciptpath',
:display_name => "Script path",
:type => "string",
:required => "optional"
attribute 'mediawiki/admin_user',
:display_name => "Admin user",
:type => "string",
:required => "recommended"
attribute 'mediawiki/admin_password',
:display_name => "Admin password",
:type => "string",
:required => "recommended"
recipe "mediawiki::default", "Installs/Configures mediawiki"
supports "centos"
supports "debian"

View File

@@ -63,8 +63,8 @@ bash "configure_mediawiki_database" do
cwd node["mediawiki"]["webdir"]
code "php maintenance/install.php" +
" --pass '" + node["mediawiki"]["admin_password"] +
"' --dbserver 'localhost:/run/mysql-default/mysqld.sock" +
"' --dbname '" + node["mediawiki"]["db"]["name"] +
"' --dbpass '" + node["mediawiki"]["db"]["pass"] +
"' --dbuser '" + node["mediawiki"]["db"]["user"] +
"' --server '" + node["mediawiki"]["server"] +
"' --scriptpath '" + node["mediawiki"]["scriptpath"] +