Skip to content

Commit

Permalink
Commenting out our custom vars now that they are in the playbooks.
Browse files Browse the repository at this point in the history
  • Loading branch information
jonpugh committed Apr 12, 2016
1 parent 646bf12 commit 70ddeda
Show file tree
Hide file tree
Showing 3 changed files with 185 additions and 185 deletions.
112 changes: 56 additions & 56 deletions vars.Debian.yml
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
---
# for vars.Debian.yml
apache_user: www-data
apache_confd_path: /etc/apache2/conf-enabled/aegir.conf
apache_control: /usr/sbin/apache2ctl
apache_php_ini_path: /etc/php5/apache2/php.ini
apache_daemon: apache2

nginx_user: www-data
nginx_confd_path: /etc/nginx/conf.d/aegir.conf
nginx_control: /etc/init.d/nginx
nginx_php_ini_path: /etc/php5/fpm/php.ini
nginx_www_pool_path: /etc/php5/fpm/pool.d/www.conf
nginx_daemon: nginx
fpm_daemon: php5-fpm
fpm_user: www-data
fpm_group: www-data

mysql_cnf_path: /etc/mysql/my.cnf
mysql_daemon: mysql

supervisor_daemon: supervisor
supervisor_hosting_queued_conf_path: /etc/supervisor/conf.d/hosting-queue-runner.conf

motd_path: /etc/update-motd.d/95-ansible

bashrc_path: /etc/bash.bashrc

packages:
- mariadb-client
- mariadb-server-5.5
- php5-cli
- php5-curl
- php5-gd
- php5-mysql
- php5-mcrypt
- php-pear
- postfix
- sudo
- rsync
- git-core
- unzip
- vim
- git
- curl
- supervisor
- python-mysqldb
- openssl

apache_packages:
- apache2
- php5

nginx_packages:
- nginx
- php5-fpm
#---
## for vars.Debian.yml
#apache_user: www-data
#apache_confd_path: /etc/apache2/conf-enabled/aegir.conf
#apache_control: /usr/sbin/apache2ctl
#apache_php_ini_path: /etc/php5/apache2/php.ini
#apache_daemon: apache2
#
#nginx_user: www-data
#nginx_confd_path: /etc/nginx/conf.d/aegir.conf
#nginx_control: /etc/init.d/nginx
#nginx_php_ini_path: /etc/php5/fpm/php.ini
#nginx_www_pool_path: /etc/php5/fpm/pool.d/www.conf
#nginx_daemon: nginx
#fpm_daemon: php5-fpm
#fpm_user: www-data
#fpm_group: www-data
#
#mysql_cnf_path: /etc/mysql/my.cnf
#mysql_daemon: mysql
#
#supervisor_daemon: supervisor
#supervisor_hosting_queued_conf_path: /etc/supervisor/conf.d/hosting-queue-runner.conf
#
#motd_path: /etc/update-motd.d/95-ansible
#
#bashrc_path: /etc/bash.bashrc
#
#packages:
# - mariadb-client
# - mariadb-server-5.5
# - php5-cli
# - php5-curl
# - php5-gd
# - php5-mysql
# - php5-mcrypt
# - php-pear
# - postfix
# - sudo
# - rsync
# - git-core
# - unzip
# - vim
# - git
# - curl
# - supervisor
# - python-mysqldb
# - openssl
#
#apache_packages:
# - apache2
# - php5
#
#nginx_packages:
# - nginx
# - php5-fpm
130 changes: 65 additions & 65 deletions vars.RedHat.yml
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
---
# for vars.RedHat.yml
local_bin_path: /usr/local/sbin

apache_user: apache
apache_confd_path: /etc/httpd/conf.d/aegir.conf
apache_control: /usr/sbin/apachectl
apache_daemon: httpd
apache_php_ini_path: /etc/php.ini

nginx_user: nginx
nginx_conf_path: /etc/nginx/nginx.conf
nginx_confd_path: /etc/nginx/conf.d/aegir.conf
nginx_control: /usr/sbin/nginx
nginx_php_ini_path: /etc/php.ini
nginx_www_pool_path: /etc/php-fpm.d/www.conf
nginx_daemon: nginx
fpm_daemon: php-fpm
fpm_user: aegir
fpm_group: aegir

mysql_cnf_path: /etc/my.cnf
mysql_daemon: mariadb.service

supervisor_daemon: supervisord
supervisor_hosting_queued_conf_path: /etc/supervisord.d/hosting-queue-runner.ini

motd_path: /etc/motd

bashrc_path: /etc/bashrc

packages:
- php55
- php55-php-mysqlnd
- php55-php-cli
- php55-php-gd
- php55-php-process
- php55-php-pear
- php55-php-xml
# - php-mcrypt
- php55-php-mbstring
- postfix
- sudo
- rsync
- git-core
- unzip
- vim
- git
- cronie
- mariadb
- mariadb-server
- MySQL-python
# I think this needs to be installed before these packages.
# - epel-release
- supervisor
- openssl
- mod_ssl

apache_packages:
- httpd
- php55-php

nginx_packages:
- nginx
- php55-php-fpm
#---
## for vars.RedHat.yml
#local_bin_path: /usr/local/sbin
#
#apache_user: apache
#apache_confd_path: /etc/httpd/conf.d/aegir.conf
#apache_control: /usr/sbin/apachectl
#apache_daemon: httpd
#apache_php_ini_path: /etc/php.ini
#
#nginx_user: nginx
#nginx_conf_path: /etc/nginx/nginx.conf
#nginx_confd_path: /etc/nginx/conf.d/aegir.conf
#nginx_control: /usr/sbin/nginx
#nginx_php_ini_path: /etc/php.ini
#nginx_www_pool_path: /etc/php-fpm.d/www.conf
#nginx_daemon: nginx
#fpm_daemon: php-fpm
#fpm_user: aegir
#fpm_group: aegir
#
#mysql_cnf_path: /etc/my.cnf
#mysql_daemon: mariadb.service
#
#supervisor_daemon: supervisord
#supervisor_hosting_queued_conf_path: /etc/supervisord.d/hosting-queue-runner.ini
#
#motd_path: /etc/motd
#
#bashrc_path: /etc/bashrc
#
#packages:
# - php55
# - php55-php-mysqlnd
# - php55-php-cli
# - php55-php-gd
# - php55-php-process
# - php55-php-pear
# - php55-php-xml
## - php-mcrypt
# - php55-php-mbstring
# - postfix
# - sudo
# - rsync
# - git-core
# - unzip
# - vim
# - git
# - cronie
# - mariadb
# - mariadb-server
# - MySQL-python
## I think this needs to be installed before these packages.
## - epel-release
# - supervisor
# - openssl
# - mod_ssl
#
#apache_packages:
# - httpd
# - php55-php
#
#nginx_packages:
# - nginx
# - php55-php-fpm
128 changes: 64 additions & 64 deletions vars.yml
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@

# The version to install.
devshop_version: 1.x

# The version of drush to install.
# This is passed directly to the `composer global require` command:
# composer global require drush/drush:{{ drush_version }}
drush_version: 8.*

# VAGRANT variables.
# Set development to TRUE if you wish to contribute to devshop development.

# You may also add a file to this folder called ".development_mode". If this file is present, development mode will always be enabled.
vagrant_development: FALSE
vagrant_private_network_ip: 10.10.10.10
vagrant_install_script: install.sh
vagrant_install_script_args: [--playbook=/vagrant]

# Defaults virtualbox vagrant machines to 2GB.
vagrant_virtualbox_memory: 2048

remote_vagrant_private_network_ip: 10.10.10.11
remote_server_hostname: devshop.remote

remote2_vagrant_private_network_ip: 10.10.10.12
remote2_server_hostname: devshop.remote2


# DEVSHOP variables
# The hostname will be overridden by install.sh to match the server it is run on.
server_hostname: local.devshop.site
server_webserver: apache

local_bin_path: /usr/local/bin

mysql_root_password: RandomizedByInstallSh
php_memory_limit: 256M
php_post_max_size: 32M
php_upload_max_filesize: 32M

php_timezone: America/New_York

ansible_playbook: playbook.yml


devshop_working_copy: --working-copy

devshop_provision_repo: https://github.com/opendevshop/devshop_provision.git

drush_dl_method: wget

devshop_drush_packages:
provision: 7.x-3.x
registry_rebuild: 7.x-2.2

devshop_makefile: build-devmaster.make
devshop_install_profile: devmaster

aegir_user_uid: 12345

drush_path: "{{ local_bin_path }}/drush"
devshop_cli_path: "{{ local_bin_path }}/devshop"

supervisor_running: true
#
## The version to install.
#devshop_version: 1.x
#
## The version of drush to install.
## This is passed directly to the `composer global require` command:
## composer global require drush/drush:{{ drush_version }}
#drush_version: 8.*
#
## VAGRANT variables.
## Set development to TRUE if you wish to contribute to devshop development.
#
## You may also add a file to this folder called ".development_mode". If this file is present, development mode will always be enabled.
#vagrant_development: FALSE
#vagrant_private_network_ip: 10.10.10.10
#vagrant_install_script: install.sh
#vagrant_install_script_args: [--playbook=/vagrant]
#
## Defaults virtualbox vagrant machines to 2GB.
#vagrant_virtualbox_memory: 2048
#
#remote_vagrant_private_network_ip: 10.10.10.11
#remote_server_hostname: devshop.remote
#
#remote2_vagrant_private_network_ip: 10.10.10.12
#remote2_server_hostname: devshop.remote2
#
#
## DEVSHOP variables
## The hostname will be overridden by install.sh to match the server it is run on.
#server_hostname: local.devshop.site
#server_webserver: apache
#
#local_bin_path: /usr/local/bin
#
#mysql_root_password: RandomizedByInstallSh
#php_memory_limit: 256M
#php_post_max_size: 32M
#php_upload_max_filesize: 32M
#
#php_timezone: America/New_York
#
#ansible_playbook: playbook.yml
#
#
#devshop_working_copy: --working-copy
#
#devshop_provision_repo: https://github.com/opendevshop/devshop_provision.git
#
#drush_dl_method: wget
#
#devshop_drush_packages:
# provision: 7.x-3.x
# registry_rebuild: 7.x-2.2
#
#devshop_makefile: build-devmaster.make
#devshop_install_profile: devmaster
#
#aegir_user_uid: 12345
#
#drush_path: "{{ local_bin_path }}/drush"
#devshop_cli_path: "{{ local_bin_path }}/devshop"
#
#supervisor_running: true

0 comments on commit 70ddeda

Please sign in to comment.