From fd2b1ca6c14f6168f17ffce2cc6e8b7cee1a4d67 Mon Sep 17 00:00:00 2001 From: Dorian Pula Date: Thu, 25 Jun 2015 18:00:07 -0400 Subject: [PATCH] Update to include hostname in the configuration. --- README.md | 13 +++++++++---- defaults/main.yml | 2 ++ meta/main.yml | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b00c903..cfe18da 100644 --- a/README.md +++ b/README.md @@ -30,10 +30,12 @@ role). rookeries_environment_name: ... ... roles: - - { role: ansible-rookeries, - app_nginx_hostname: app.domain.net, - app_uwsgi_port: 8080, - rookeries_app_config: "{{ my_rookeries_app_config }}" } + - role: ansible-rookeries + rookeries_app_config: "{{ vagrant_rookeries_app_config }}" + rookeries_db: "{{ rookeries_db_setup }}" + rookeries_environ_type: prod + rookeries_package_path: "{{ rookeries_package }}" + rookeries_app_hostname: rookeries.org Role Variables -------------- @@ -59,6 +61,9 @@ Role Variables - rookeries_app_name: - Configures the unique name of the rookeries app. - Default: rookeries +- rookeries_app_hostname: + - Configures the hostname of site (https://my.rookeries_site.net) serving the rookeries app. + - Default: localhost - rookeries_environ_type: - The mode of the setup. Setting to "dev" enables the use of a SMTP fake server to help with development. - Default: dev diff --git a/defaults/main.yml b/defaults/main.yml index c0a9cd8..6d5646b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,6 +16,8 @@ rookeries_app_name: rookeries # The mode of the setup. Setting to "dev" enables the use of a SMTP fake server to help with development. rookeries_environ_type: dev +rookeries_app_hostname: localhost + # The default configuration for running rookeries rookeries_app_config: diff --git a/meta/main.yml b/meta/main.yml index 14ea3fd..908009a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -16,7 +16,7 @@ galaxy_info: dependencies: - { role: dorianpula.nginx-uwsgi-supervisor, app_name: "{{ rookeries_app_name }}", - app_nginx_hostname: localhost, + app_nginx_hostname: "{{ rookeries_app_hostname }}", app_uwsgi_port: 8001, app_uwsgi_executable: "rookeries:make_rookeries_app()", app_uwsgi_envs: "{{ rookeries_app_config }}"}