Merge lp:~nijaba/charms/oneiric/roundcube/new-scp into lp:charms/oneiric/roundcube

[Nick Barcet]

This branch fixes a few bugs and uses the new charm-helper copy functions instead of its own

[Juan L. Negron (negronjl)]

I cannot review this as I am unable to branch lp:charms/oneiric/roundcube at the moment.
I'll try to investigate why ( I suspect this is a by-product of the switch from oneiric to precise ).

-Juan

[Juan L. Negron (negronjl)]

Both Proposed Branch and Merge Into branches are gone ...

I cannot review them ... therefore I have to reject this.

Nick:

If you moved this code somewhere else and want me to review it, let me know. I think you'll have to do another MP.

-Juan

review: Disapprove

[Kapil Thangavelu (hazmat)]

There's some discussion on the lists of this issue, namely majority of
oneiric official charms branches are mia atm.

On Wed, May 23, 2012 at 12:38 PM, Juan L. Negron
<email address hidden>wrote:

> I cannot review this as I am unable to branch lp:charms/oneiric/roundcube
> at the moment.
> I'll try to investigate why ( I suspect this is a by-product of the switch
> from oneiric to precise ).
>
> -Juan
> --
>
> https://code.launchpad.net/~nijaba/charms/oneiric/roundcube/new-scp/+merge/88239
> Your team charmers is requested to review the proposed merge of
> lp:~nijaba/charms/oneiric/roundcube/new-scp into
> lp:charms/oneiric/roundcube.
>

Unmerged revisions

34. By Nick Barcet on 2012-01-13

going around a weird output behaviour of juju-log on lxc

33. By Nick Barcet on 2012-01-11

allow execution of peer-relation-departed

32. By Nick Barcet on 2012-01-11

use the official ppa now that my changes have been merged

31. By Nick Barcet on 2012-01-11

missing $

30. By Nick Barcet on 2012-01-11

[ -e ] is true, needs to protect against that

29. By Nick Barcet on 2012-01-06

add peer-relation-departed and call to ch_sshd_set_root_login

28. By Nick Barcet on 2012-01-05

now fully working with ch_peer_copy

27. By Nick Barcet on 2011-12-17

removing an uneeded test

26. By Nick Barcet on 2011-12-17

update to use the new ch_peer_scp function

=== modified file 'hooks/install'
--- hooks/install	2011-12-11 17:44:19 +0000
+++ hooks/install	2012-01-13 09:25:46 +0000
@@ -7,7 +7,7 @@
 apt-get update
 apt-get upgrade -y
 
-apt-get install -y apache2 php5 php5-mcrypt php5-gd php5-intl php-mdb2 php-auth php-net-smtp php-net-socket php-mail-mime php5-pspell libmagic1 php-auth-sasl libjs-jquery php5-mysql libapache2-mod-php5 charm-helper-sh mysql-client tinymce
+apt-get install -y apache2 php5 php5-mcrypt php5-gd php5-intl php-mdb2 php-auth php-net-smtp php-net-socket php-mail-mime php5-pspell libmagic1 php-auth-sasl libjs-jquery php5-mysql libapache2-mod-php5 charm-helper-sh mysql-client tinymce pwgen
 
 service apache2 stop
 

=== modified file 'hooks/peer-relation-all'
--- hooks/peer-relation-all	2011-12-13 11:11:24 +0000
+++ hooks/peer-relation-all	2012-01-13 09:25:46 +0000
@@ -1,9 +1,7 @@
 #!/bin/bash
-juju-log $JUJU_REMOTE_UNIT modified its settings
-juju-log Relation settings:
-relation-get
-juju-log Relation members:
-relation-list
+ARG0=${0##*/}
+
+juju-log "$JUJU_REMOTE_UNIT - $ARG0"
 
 common="roundcube-common"
 FORMULA_DIR=$(dirname $0)
@@ -11,50 +9,22 @@
     . $FORMULA_DIR/$common
 else
     juju-log "ERROR: Could not load $common from $FORMULA_DIR"
-    echo "ERROR: Could not load $common from $FORMULA_DIR"
     exit 1
 fi
-
-juju-log $JUJU_REMOTE_UNIT new unit joined
-
-REMOTE_UNIT_ID=$(echo $JUJU_REMOTE_UNIT | cut -d/ -f2)
-LOCAL_UNIT_ID=$(echo $JUJU_UNIT_NAME | cut -d/ -f2)
-FIRST_UNIT_ID=$(echo "$(relation-list)" | head -n 1 | cut -d/ -f2)
-
-if  [[ $LOCAL_UNIT_ID -lt $REMOTE_UNIT_ID ]] && [[ $LOCAL_UNIT_ID -lt $FIRST_UNIT_ID ]] ; then
-  juju-log "this is our master"
-  relation-set des-key=$(get-des-key)
-  
-  if [[ -e $ssl_crt_f ]] && [[ -e $ssl_key_f ]]; then
-    juju-log "send-ssh-keys"
-    send-ssh-key
-  else
-    juju-log "ssl certs not set yet"
-  fi
+if [[ -e /usr/share/charm-helper/sh/peer.sh ]] ; then
+  . /usr/share/charm-helper/sh/peer.sh
 else
-  juju-log "this is a slave"
- 
-  #Handle des_key
-  des_key=$(relation-get des-key)
-  if [[ -z $des_key ]]; then
-    juju-log "roundcube: des-key not yet set." 
-  else
-    echo $des_key > ${LPATH}config/des_key
-    set-des-key $des_key
-  fi
-  
-  #Handle_certs
-  relation-set hostname=`unit-get private-address`
-  if [ -z "`relation-get ssh-key`" ] ; then
-    juju-log "ssh-key not set yet"
-  else
-    juju-log "save-ssh-keys"
-    save_ssh_key
-    relation-set ssh-key-saved=1
-  fi
-  
-  if [[ $(relation-get restart_apache) == 1 ]]; then
-    restart-apache
-  fi
+  juju-log -l ERROR "Could not load /usr/share/charm-helper/sh/peer.sh"
+fi
+
+ch_sshd_set_root_login 1
+
+des_key_path=`get-des-key-path`
+if ch_peer_copy "$ssl_crt_f" "$ssl_crt_f" "$ssl_key_f" "$ssl_key_f" "$des_key_path" "$des_key_path" ; then
+  # this is a slave and the copy is complete
+  set-des-key
+  set-ssl-cert $ssl_crt_f
+  set-ssl-cert $ssl_key_f
+  restart-apache
 fi
 

=== added file 'hooks/peer-relation-departed'
--- hooks/peer-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/peer-relation-departed	2012-01-13 09:25:46 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+ARG0=${0##*/}
+
+juju-log "$JUJU_REMOTE_UNIT - $ARG0"
+
+if [[ -e /usr/share/charm-helper/sh/peer.sh ]] ; then
+  . /usr/share/charm-helper/sh/peer.sh
+else
+  juju-log -l ERROR "Could not load /usr/share/charm-helper/sh/peer.sh"
+fi
+
+ch_peer_copy_cleanup $JUJU_REMOTE_UNIT

=== modified file 'hooks/roundcube-common'
--- hooks/roundcube-common	2011-12-14 00:31:32 +0000
+++ hooks/roundcube-common	2012-01-13 09:25:46 +0000
@@ -3,70 +3,40 @@
 LPATH="/var/opt/roundcube/"
 config_file_path="${LPATH}config/"
 config_tmp="$FORMULA_DIR/config.tmp"
+
+hostname=`unit-get public-address`
+juju-log "Retrieved hostname: $hostname"
+
 ssl_crt_f="/etc/ssl/certs/ssl-cert-roundcube.pem"
 ssl_key_f="/etc/ssl/private/ssl-cert-roundcube.key"
-ssh_key_p="/root/.ssh/"
-
-hostname=`unit-get public-address`
-juju-log "Retrieved hostname: $hostname"
-
-# Set our pub key
-function send-ssh-key {
-  remote=$(relation-get hostname)
-  ssh_key_saved=$(relation-get ssh-key-saved)
-  
-  if [[ -n $remote ]] && [[ -n $ssh_key_saved ]]; then
-    echo "sending ssl certs to: $remote"
-    scp-ssl-cert "$remote"
-    relation-set restart_apache=1
-  fi
-  
-  if [[ $ssh_key_saved != 1 ]]; then
-    if [[ ! -f "$ssh_key_p/id_rsa" ]]; then
-        ssh-keygen -q -N '' -t rsa -b 2048 -f /root/.ssh/id_rsa
-    fi
-    relation-set ssh-key="`cat /root/.ssh/id_rsa.pub`"
-    echo "ssh pub keys set"
-  fi
-
-}
-
-# Save a received pub key
-function save_ssh_key { 
-  mkdir -p $ssh_key_p
-  key=`relation-get ssh-key`
-  if [ -n "$key" ] ; then
-    grep -q -F "$key" $ssh_key_p/authorized_keys
-    if [[ $? != 0 ]]; then
-      echo "saving ssh pub key"
-      echo "$key" >> $ssh_key_p/authorized_keys
-    fi
-  else
-    echo "no keys yet"
-  fi
-}
-
-#Get the des_key, or generate if it does not exist
-function get-des-key {
-  # Generate a des key if not set yet
-  if [[ ! -e "${LPATH}config/des_key" ]]; then
-    [[ ! `which pwgen` ]] && apt-get -y install pwgen
-    des_key=$(pwgen -c -s 24 1)
-    echo $des_key > ${LPATH}config/des_key
-    juju-log "des key generated: $des_key"
-  else
-    des_key=$(cat ${LPATH}config/des_key)
-    juju-log "des key retrieved: $des_key"
-  fi
+
+#generate the des key 
+function gen-des-key {
+  [[ ! `which pwgen` ]] && apt-get -y install pwgen
+  local des_key=$(pwgen -c -s 24 1)
+  echo $des_key > ${LPATH}config/des_key
+  juju-log "des key generated: $des_key" &> /dev/null
   echo $des_key
 }
 
-
+# Get the des_key parth, or generate if it does not exist
+function get-des-key-path {
+  if ch_peer_i_am_leader && [[ ! -e "${LPATH}config/des_key" ]]; then
+    # Generate a des key if not set yet
+    set-des-key "`gen-des-key`"
+  fi
+  echo "${LPATH}config/des_key"
+}
 
 #Write the des_key to the config
 function set-des-key {
   if [[ $# < 1 ]]; then
-    des_key=$(get-des-key)
+    if [[ ! -e "${LPATH}config/des_key" ]]; then
+      # Generate a des key if not set yet
+      des_key=`gen-des-key`
+    else
+      des_key=`cat ${LPATH}config/des_key`
+    fi
   else
     des_key=$1
   fi
@@ -80,49 +50,29 @@
   chown root:www-data $LPATH/config/des_key.inc.php
 }
 
-#send over the certificate file
-function scp-ssl-cert {
-  scp -o StrictHostKeyChecking=no $ssl_crt_f root@$1:$ssl_crt_f || exit 0
-  scp $ssl_key_f root@$1:$ssl_key_f || exit 0
-}
-
-#Write the ssl cert files
+#set correct rights on ssl certs
 function set-ssl-cert {
-  if [[ $# == 2 ]]; then
-    #the content of the keys have been passed, write them
-    echo "$1" > $ssl_crt_f
-    echo "$2" > $ssl_key_f
-  else
-    #key files have been given to us? use them if they are not set yet
+  if [ $# -gt 0 ] ; then
+    chmod 0640 "$1"
+    chown root:www-data "$1"
+  else 
     ssl_crt=$(config-get ssl_crt)
     ssl_key=$(config-get ssl_key)
-    if [[ -n $ssl_crt ]] && [[ -n $ssl_key ]]; then
-      if [[ ! -e $ssl_crt ]]; then
-        juju-log "HTTPS cannot be activated: you must provide a valid full path to a SSL certificate file in ssl_crt"
-        exit 0
-      fi
-      if [[ ! -e $ssl_key ]]; then
-        juju-log "HTTPS cannot be activated: you must provide a valid full path to a SSL certificate key file in ssl_key"
-        do_https=0
-      fi
-      cat $ssl_crt > $ssl_crt_f
-      cat $ssl_key > $ssl_key_f
-      
-      #restrict access to cert files
-      chmod 0640 $ssl_crt_f
-      chmod 0640 $ssl_key_f
-      chown root:www-data $ssl_crt_f
-      chown root:www-data $ssl_key_f
-    else
-      juju-log "HTTPS cannot be activated: you must provide a valid full path to a SSL certificate file in ssl_crt & ssl_key"
+    if [ -e "$ssl_crt" ] ; then
+      cp $ssl_crt $ssl_crt_f
+      set-ssl-cert $ssl_crt_f
+    else
+      juju-log "Config's file ssl_crt: $ssl_crt does not exist"
+    fi
+     if [ -e "$ssl_key" ] ; then
+      cp $ssl_key $ssl_key_f
+      set-ssl-cert $ssl_key_f
+    else
+      juju-log "Config's file ssl_key: $ssl_key does not exist"
     fi
   fi
-  
-
 }
 
-
-
 #Store the invariant part of the config file on disk, so that we can 
 #reuse it outside of a relation-changed hook. This is a workaround until
 #we will be able to do relation-get <relation> <variable>
@@ -141,7 +91,7 @@
   password=`relation-get password`
   host=`relation-get private-address`
 
-  if [[ ! -e $LPATH/config/db.juju.inc.php ]]; then
+  if [[ ! -e "$LPATH/config/db.juju.inc.php" ]]; then
     juju-log "Starting roundcube install"
     echo "Starting roundcube install"
     mysql -h $host -u $user --password=$password $database < $LPATH/SQL/mysql.initial.sql
@@ -175,7 +125,7 @@
 #Set the configuration values that can be changed after the relation
 #with the db has been done
 function set-config {
-  if [[ ! -e $LPATH/config/db.juju.inc.php ]] ; then
+  if [[ ! -e "$LPATH/config/db.juju.inc.php" ]] ; then
     juju-log "Database relation has not been established yet, can't write the config"
     echo "Database relation has not been established yet, can't write the config"
     exit 0
@@ -195,11 +145,11 @@
   do_https=$(config-get do_https)
 
   if [[ $do_https != 0 ]]; then
-    if [[ ! -e $ssl_crt_f ]]; then
+    if [[ ! -e "$ssl_crt_f" ]]; then
       juju-log "HTTPS cannot be activated: you must provide a valid full path to a SSL certificate file in ssl_crt"
       do_https=0
     fi
-    if [[ ! -e $ssl_key_f ]]; then
+    if [[ ! -e "$ssl_key_f" ]]; then
       juju-log "HTTPS cannot be activated: you must provide a valid full path to a SSL certificate key file in ssl_key"
       do_https=0
     fi
@@ -211,7 +161,7 @@
     apache_config_file_path="/etc/apache2/sites-available/${hostname}.ssl"
 
     #check if modifications are needed
-    if [[ -e apache_config_file_path ]]; then
+    if [[ -e "$apache_config_file_path" ]]; then
       grep -q "Listen $do_https" apache_config_file_path
       if [[ $? == 0 ]]; then
         grep -q "SSLCertificateFile $ssl_crt_f" apache_config_file_path
@@ -249,8 +199,8 @@
 function restart-apache {
   juju-log "Restarting apache2 service"
   
-  if [[ ! -e $LPATH/config/db.juju.inc.php ]] ; then
-    juju-log "Database relation has not been established yet, let's no (re)start apache"
+  if [[ ! -e "$LPATH/config/db.juju.inc.php" ]] ; then
+    juju-log "Database relation has not been established yet, let's not (re)start apache"
     exit 0
   fi
   

=== modified file 'revision'
--- revision	2011-12-13 11:01:16 +0000
+++ revision	2012-01-13 09:25:46 +0000
@@ -1,1 +1,1 @@
-17
+27