Commit a11ca46c authored by Bartek Rutkowski's avatar Bartek Rutkowski
Browse files

* Removed obsolete task dependencies in tasks/main.yml

* Changed variable names used in templates/nginx.conf.j2, templates/poudriere.conf.j2 and vars/main.yml to be logically called and organized
parent 52c29b57
......@@ -9,24 +9,18 @@
- php5-arcanist
- subversion
- figlet
register: pkg
- name: Create 'tp' script
copy: src=tp dest=/usr/local/bin/tp
- name: Create 'poudriere.conf' file
template: src=poudriere.conf.j2 dest=/usr/local/etc/poudriere.conf
register: poudriere_conf
when: pkg | success
- name: Create Poudriere jails 'make.conf' file
copy: src=poudriere_make.conf dest=/usr/local/etc/poudriere.d/make.conf
when: poudriere_conf | success
- name: Create 'nginx.conf' file
template: src=nginx.conf.j2 dest=/usr/local/etc/nginx/nginx.conf
register: nginx_conf
when: poudriere_conf | success
- name: Create '/root/.subversion' dir
file: path=/root/.subversion state=directory
......@@ -43,7 +37,6 @@
- { architecture: 'i386', version: '10.1-RELEASE', name: '101' }
- { architecture: 'amd64', version: '9.3-RELEASE', name: '93' }
- { architecture: 'i386', version: '9.3-RELEASE', name: '93' }
when: poudriere_conf | success
register: update_jails
ignore_errors: yes
changed_when: '"No updates are available to install." not in update_jails.stdout'
......@@ -55,7 +48,6 @@
- name: Update Poudriere ports tree
command: poudriere ports -u -m svn
when: poudriere_conf | success
register: update_ports
- name: Create Poudriere ports tree
......
......@@ -37,14 +37,14 @@ http {
server {
listen {{ nginx_listen_port }};
server_name {{ poudriere_hostname }};
server_name {{ nginx_server_name }};
access_log /var/log/nginx/{{ poudriere_hostname }}.access.log main;
access_log /var/log/nginx/{{ nginx_server_name }}.access.log main;
root /usr/local/share/poudriere/html;
location /data {
alias {{ zrootfs }}/data/logs/bulk;
alias {{ poudriere_zrootfs }}/data/logs/bulk;
# Allow caching dynamic files but ensure they get rechecked
location ~* ^.+\.(log|txz|tbz|bz2|gz)$ {
......@@ -67,8 +67,8 @@ http {
break;
}
location {{ zrootfs }} {
root {{ zrootfs }}/data/packages/;
location {{ poudriere_zrootfs }} {
root {{ poudriere_zrootfs }}/data/packages/;
autoindex on;
}
}
......
......@@ -11,14 +11,14 @@
# You need at least 7GB of free space in this pool to have a working
# poudriere.
#
ZPOOL={{ zpool }}
ZPOOL={{ poudriere_zpool }}
### NO ZFS
# To not use ZFS, define NO_ZFS=yes
#NO_ZFS=yes
# root of the poudriere zfs filesystem, by default /poudriere
ZROOTFS={{ zrootfs }}
ZROOTFS={{ poudriere_zrootfs }}
# the host where to download sets for the jails setup
# You can specify here a host or an IP
......@@ -64,7 +64,7 @@ USE_PORTLINT=yes
# all - Run the entire build in memory, including builder jails.
# yes - Only enables tmpfs(5) for wrkdir
# EXAMPLE: USE_TMPFS="wrkdir data"
USE_TMPFS={{ use_tmpfs }}
USE_TMPFS={{ poudriere_use_tmpfs }}
# How much memory to limit tmpfs size to for *each builder* in GiB
# (default: none)
......@@ -112,7 +112,7 @@ DISTFILES_CACHE=/usr/ports/distfiles
# ccache support. Supply the path to your ccache cache directory.
# It will be mounted into the jail and be shared among all jails.
CCACHE_DIR={{ ccache_dir }}
CCACHE_DIR={{ poudriere_ccache_dir }}
# parallel build support.
#
......@@ -121,12 +121,12 @@ CCACHE_DIR={{ ccache_dir }}
# by specifying the -J flag to bulk/testport.
#
# Example to define PARALLEL_JOBS to one single job
PARALLEL_JOBS={{ parallel_jobs }}
MAKE_JOBS_NUMBER={{ make_jobs_number }}
PARALLEL_JOBS={{ poudriere_parallel_jobs }}
MAKE_JOBS_NUMBER={{ poudriere_make_jobs_number }}
# How many jobs should be used for preparing the build? These tend to
# be more IO bound and may be worth tweaking. Default: Same as PARALLEL_JOBS
#PREPARE_PARALLEL_JOBS=2
#PREPARE_PARALLEL_JOBS={{ poudriere_prepare_parallel_jobs_number }}
# If set, failed builds will save the WRKDIR to ${POUDRIERE_DATA}/wrkdirs
......@@ -156,7 +156,7 @@ MAKE_JOBS_NUMBER={{ make_jobs_number }}
# By default MAKE_JOBS is disabled to allow only one process per cpu
# Use the following to allow it anyway
ALLOW_MAKE_JOBS={{ allow_make_jobs }}
ALLOW_MAKE_JOBS={{ poudriere_allow_make_jobs }}
# List of packages that will always be allowed to use MAKE_JOBS
# regardless of ALLOW_MAKE_JOBS. This is useful for allowing ports
......@@ -171,7 +171,7 @@ ALLOW_MAKE_JOBS={{ allow_make_jobs }}
# URL where your POUDRIERE_DATA/logs are hosted
# This will be used for giving URL hints to the HTML output when
# scheduling and starting builds
URL_BASE=http://{{ poudriere_hostname }}
URL_BASE={{ poudriere_url_base }}
# This defines the max time (in seconds) that a command may run for a build
......
poudriere_hostname: your poudriere host name goes here, eg: poudriere.example.com
zpool: your ZFS pool name, eg: zroot
zrootfs: your poudriere root directory, eg: /pd
use_tmpfs: depends on your host memory available, eg: all
ccache_dir: ccache directory to use, eg: "{{ zrootfs }}/ccache"
parallel_jobs: depends on your host CPU's available, eg: 8
make_jobs_number: depends on your host CPU's available, eg: 8
allow_make_jobs: depends on your host CPU's available, eg: yes
nginx_listen_port: depends on your needs and/or network topology and configuration, eg: 80
poudriere_zpool: your ZFS pool name, eg: zroot
poudriere_zrootfs: your poudriere root directory, eg: /pd
poudriere_use_tmpfs: depends on your host memory available, eg: all
poudriere_ccache_dir: ccache directory to use, eg: "{{ zrootfs }}/ccache"
poudriere_parallel_jobs: depends on your host CPU's available, eg: 8
poudriere_make_jobs_number: depends on your host CPU's available, eg: 8
poudriere_allow_make_jobs: depends on your host CPU's available, eg: yes
poudriere_url_base: "http://{{ poudriere_hostname }}"
poudriere_prepare_parallel_jobs_number: depends on your host CPU's and disk IO speeds, eg: 2
nginx_listen_port: depends on your needs and/or network topology and configuration, eg:80
nginx_server_name: "{{ poudriere_hostname }}"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment