From 80554298d1ee4258061d17ac210d7b58e34b5a00 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Thu, 15 Nov 2018 14:41:20 +0100 Subject: [PATCH] chg: dev: whitespaces !minor --- apache/actions/load | 1 - apache/build/Dockerfile | 2 -- apache/hooks/web_proxy-relation-joined | 1 - odoo-tecnativa/actions/save | 2 -- precise/0k-openerp/hooks/install | 1 - precise/dns/hooks/install | 3 +-- precise/ldap/hooks/install | 2 +- 7 files changed, 2 insertions(+), 10 deletions(-) diff --git a/apache/actions/load b/apache/actions/load index af33b58..9e3dfef 100755 --- a/apache/actions/load +++ b/apache/actions/load @@ -40,7 +40,6 @@ if [ -z "$DOMAIN" ]; then exit 1 fi - . "$CHARM_PATH"/lib/common set -e diff --git a/apache/build/Dockerfile b/apache/build/Dockerfile index 1d6296b..812a926 100644 --- a/apache/build/Dockerfile +++ b/apache/build/Dockerfile @@ -1,6 +1,5 @@ FROM docker.0k.io/apache:carif - ## Limesurvey # RUN apt-get update && \ # DEBIAN_FRONTEND=noninteractive apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev && \ @@ -24,4 +23,3 @@ RUN apt-get update && apt-get install -y --force-yes ssl-cert COPY entrypoint.sh /entrypoint.sh ENTRYPOINT [ "/entrypoint.sh" ] - diff --git a/apache/hooks/web_proxy-relation-joined b/apache/hooks/web_proxy-relation-joined index 1bff937..ecffa2c 100755 --- a/apache/hooks/web_proxy-relation-joined +++ b/apache/hooks/web_proxy-relation-joined @@ -11,4 +11,3 @@ APACHE_CORE_RULES=$(relation-get apache-core-rules 2>/dev/null) || true if [ "$APACHE_CORE_RULES" ]; then apache_core_rules_add "$APACHE_CORE_RULES" || exit 1 fi - diff --git a/odoo-tecnativa/actions/save b/odoo-tecnativa/actions/save index 06a2646..f400c12 100755 --- a/odoo-tecnativa/actions/save +++ b/odoo-tecnativa/actions/save @@ -60,8 +60,6 @@ if [ -e "$output" -a -z "$force" ]; then fi - - set -e ## Ensure odoo is launched diff --git a/precise/0k-openerp/hooks/install b/precise/0k-openerp/hooks/install index 0f7ec6b..9606d39 100755 --- a/precise/0k-openerp/hooks/install +++ b/precise/0k-openerp/hooks/install @@ -33,7 +33,6 @@ RELEASE=${RELEASE:-} test -z "$RELEASE" && export RELEASE=$(lsb_release -c -s) - ## ## Code ## diff --git a/precise/dns/hooks/install b/precise/dns/hooks/install index a0a9c95..51e982c 100755 --- a/precise/dns/hooks/install +++ b/precise/dns/hooks/install @@ -1,7 +1,6 @@ #!/bin/bash -set -eux - +set -eux apt-get -y install bind9 logrotate diff --git a/precise/ldap/hooks/install b/precise/ldap/hooks/install index f4f6b95..ec983ec 100755 --- a/precise/ldap/hooks/install +++ b/precise/ldap/hooks/install @@ -17,7 +17,7 @@ LDAP_GROUPS_SUFFIX=${LDAP_GROUPS_SUFFIX:-ou=Group,$LDAP_ROOT_SUFFIX} LDAP_DEFAULT_GROUP=${LDAP_DEFAULT_GROUP:-Domain Users} LDAP_DEFAULT_HOME=${LDAP_DEFAULT_HOME:-/home} -set -eux # -x for verbose logging to juju debug-log +set -eux ## XXXvlab: this is interactive : requires a password ! apt-get install -y slapd