From 73eb744da5af1ed469fbf8f9556d1c8b3cc1425f Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 8 Sep 2017 15:49:12 +0200
Subject: [PATCH] ansible-roles/drupal#14 Change exatr var limit_drupal_sitie
to limit_site and enhance the script apache config to make use of it
---
scripts/apache-config.yml | 7 +++++++
scripts/drupal-config.yml | 2 +-
scripts/drupal-deploy.yml | 2 +-
scripts/drush-aliases.yml | 2 +-
scripts/jailkit-update.yml | 2 +-
scripts/jailkit-user.yml | 2 +-
6 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/scripts/apache-config.yml b/scripts/apache-config.yml
index 426dc287..a167c68c 100644
--- a/scripts/apache-config.yml
+++ b/scripts/apache-config.yml
@@ -4,6 +4,9 @@ cli:
application:
default: 'apache'
help: 'The application to configure Apache for, e.g. apache, drupal, piwk, nextcloud, kibana'
+ site:
+ default: False
+ help: 'The id of a site (only useful with certain applications like Drupal or Piwik)'
arguments:
playbook: 'role'
roles_exclude:
@@ -20,3 +23,7 @@ command:
args:
- 'limit'
- 'application'
+ - name: 'extra-vars'
+ value: 'limit_site=%s'
+ args:
+ - 'site'
diff --git a/scripts/drupal-config.yml b/scripts/drupal-config.yml
index 8c052050..9620ff1a 100644
--- a/scripts/drupal-config.yml
+++ b/scripts/drupal-config.yml
@@ -27,7 +27,7 @@ command:
- 'limit'
- name: 'extra-vars'
condition: 'site'
- value: 'limit_drupal_site=%s'
+ value: 'limit_site=%s'
args:
- 'site'
- name: 'start-at-task'
diff --git a/scripts/drupal-deploy.yml b/scripts/drupal-deploy.yml
index fd704ee3..a829e4e8 100644
--- a/scripts/drupal-deploy.yml
+++ b/scripts/drupal-deploy.yml
@@ -24,7 +24,7 @@ command:
args:
- 'host'
- name: 'extra-vars'
- value: 'limit_drupal_site=%s'
+ value: 'limit_site=%s'
args:
- 'site'
- name: 'start-at-task'
diff --git a/scripts/drush-aliases.yml b/scripts/drush-aliases.yml
index 4546562d..35119053 100644
--- a/scripts/drush-aliases.yml
+++ b/scripts/drush-aliases.yml
@@ -22,6 +22,6 @@ command:
- 'limit'
- name: 'extra-vars'
condition: 'site'
- value: 'limit_drupal_site=%s'
+ value: 'limit_site=%s'
args:
- 'site'
diff --git a/scripts/jailkit-update.yml b/scripts/jailkit-update.yml
index f3707f9d..afe62429 100644
--- a/scripts/jailkit-update.yml
+++ b/scripts/jailkit-update.yml
@@ -17,6 +17,6 @@ command:
value: 'JailKit Role'
- name: 'extra-vars'
condition: 'site'
- value: 'limit_drupal_site=%s'
+ value: 'limit_site=%s'
args:
- 'site'
diff --git a/scripts/jailkit-user.yml b/scripts/jailkit-user.yml
index 13f64a4c..f7e5d02e 100644
--- a/scripts/jailkit-user.yml
+++ b/scripts/jailkit-user.yml
@@ -15,6 +15,6 @@ command:
- 'SetPermissions'
- name: 'extra-vars'
condition: 'site'
- value: 'limit_drupal_site=%s'
+ value: 'limit_site=%s'
args:
- 'site'
--
GitLab