Browse Source

chg: dev: whitespaces !minor

framadate
Valentin Lab 6 years ago
parent
commit
80554298d1
  1. 1
      apache/actions/load
  2. 2
      apache/build/Dockerfile
  3. 1
      apache/hooks/web_proxy-relation-joined
  4. 2
      odoo-tecnativa/actions/save
  5. 1
      precise/0k-openerp/hooks/install
  6. 3
      precise/dns/hooks/install
  7. 2
      precise/ldap/hooks/install

1
apache/actions/load

@ -40,7 +40,6 @@ if [ -z "$DOMAIN" ]; then
exit 1 exit 1
fi fi
. "$CHARM_PATH"/lib/common . "$CHARM_PATH"/lib/common
set -e set -e

2
apache/build/Dockerfile

@ -1,6 +1,5 @@
FROM docker.0k.io/apache:carif FROM docker.0k.io/apache:carif
## Limesurvey ## Limesurvey
# RUN apt-get update && \ # RUN apt-get update && \
# DEBIAN_FRONTEND=noninteractive apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev && \ # 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 COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT [ "/entrypoint.sh" ] ENTRYPOINT [ "/entrypoint.sh" ]

1
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 if [ "$APACHE_CORE_RULES" ]; then
apache_core_rules_add "$APACHE_CORE_RULES" || exit 1 apache_core_rules_add "$APACHE_CORE_RULES" || exit 1
fi fi

2
odoo-tecnativa/actions/save

@ -60,8 +60,6 @@ if [ -e "$output" -a -z "$force" ]; then
fi fi
set -e set -e
## Ensure odoo is launched ## Ensure odoo is launched

1
precise/0k-openerp/hooks/install

@ -33,7 +33,6 @@ RELEASE=${RELEASE:-}
test -z "$RELEASE" && export RELEASE=$(lsb_release -c -s) test -z "$RELEASE" && export RELEASE=$(lsb_release -c -s)
## ##
## Code ## Code
## ##

3
precise/dns/hooks/install

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
set -eux
set -eux
apt-get -y install bind9 logrotate apt-get -y install bind9 logrotate

2
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_GROUP=${LDAP_DEFAULT_GROUP:-Domain Users}
LDAP_DEFAULT_HOME=${LDAP_DEFAULT_HOME:-/home} 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 ! ## XXXvlab: this is interactive : requires a password !
apt-get install -y slapd apt-get install -y slapd

Loading…
Cancel
Save