utils/configure_dkim_dns

@@ -8,7 +8,7 @@ function provision_dkim () {
 
 
 function configure_dns () {
-  domain_key=`cat /data/domains/mail.indie.host/opendkim/keys/${arg_u}/mail.txt | cut -d\" -f2 | sed 'N;s/\n//g' | sed 's/ //g'%2B`
+  domain_key=`cat /data/domains/mail.indie.host/opendkim/keys/${arg_u}/mail.txt | cut -d\" -f2 | sed 'N;s/\n//g' | sed 's/ //g' | sed 's/+/%2B/g' | sed 's/\//%2F/g'`
   info "Configuring DNS."
   arguments="&Command=namecheap.domains.dns.setHosts\
 &DomainName=${arg_u}\

utils/disable

-systemctl_commands
\ No newline at end of file

utils/dump_all.sh

+#!/bin/bash -eux
+
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin
+
+echo BEGIN > /tmp/dump-logs
+date > /tmp/dump-logs
+
+for domain in `ls /data/domains`; do
+  echo $domain >> /tmp/dump-logs
+  cd /data/domains/${domain}/
+  if [[ -f ./scripts/pre-backup ]]; then
+    cat ./scripts/pre-backup >> /tmp/dump-logs
+    ./scripts/pre-backup >> /tmp/dump-logs
+  fi
+done
+
+date > /tmp/dump
+echo END >> /tmp/dump-logs
+date >> /tmp/dump-logs

utils/enable

-systemctl_commands
\ No newline at end of file

utils/libre

+#!/bin/bash -eu
+
+
+function error_path {
+  >&2 echo "Error: you must be in either /data/domains/*/ or /system/*/ to execute these commands"
+  exit 1
+}
+
+function systemctl_param {
+  first_level_path=`pwd | cut -d'/' -f2`
+  second_level_path=`pwd | cut -d'/' -f3`
+
+  if [ "$first_level_path" == "system" ]; then
+    module=`pwd | cut -d'/' -f3`
+    if [ -n "$module" ]; then
+      echo s@$module
+    else
+      error_path
+    fi
+  elif [ "$first_level_path" == "data" ] && [ "$second_level_path" == "domains" ]; then
+    domain=`pwd | cut -d'/' -f4`
+    if [ -n "$domain" ]; then
+      echo u@$domain
+    else
+      error_path
+    fi
+  else
+    error_path
+  fi
+}
+
+function show_usage {
+  echo "Usage:"
+  echo " - provision -a <app_repo_url> -u <domainname> -s : install and start a libre.sh service."
+  echo " - start|status|enable|disable|restart|stop: command sent to systemctl."
+  echo " - ps|exec|logs: command sent to docker compose."
+  echo " - update: to update the current folder."
+  echo " - stats: show docker stats with names."
+  echo " - delete <domainname>: remove a libre.sh service."
+  echo " - getsize <domainname>: give you the size of the installed application"
+  exit 1
+}
+
+if [ $# -eq 0 ]; then
+  show_usage
+fi
+
+case "$1" in
+  start|status|enable|disable|restart|stop)
+    if [ -n "$(systemctl_param)" ]; then
+      echo "systemctl $1 $(systemctl_param)"
+      systemctl $1 $(systemctl_param)
+    fi;;
+  journal)
+    if [ -n "$(systemctl_param)" ]; then
+      journalctl -fu $(systemctl_param)
+    fi;;
+  ps|exec|logs)
+    if [ -f ./env ]; then
+      env $(cat ./env | xargs) docker-compose $1 ${@:2}
+    else
+      docker-compose $1 ${@:2}
+    fi;;
+  update)
+    if [ "$(pwd)" == "/libre.sh" ]; then
+      git pull
+      cp /libre.sh/unit-files/* /etc/systemd/system && systemctl daemon-reload
+      cp /libre.sh/utils/* /opt/bin/
+    elif [ -n "$(systemctl_param)" ]; then
+      git pull
+      docker-compose pull
+      docker-compose build
+      /opt/bin/libre restart
+    fi;;
+  provision)
+    provision ${@:2};;
+  stats)
+    docker stats $(docker ps|grep -v "NAMES"|awk '{ print $NF }'|tr "\n" " ");;
+  delete)
+    if [ $# -ne 2 ]; then
+      echo "delete requires a domainname argument."
+      exit 1
+    fi
+
+    read -p "Are you sure you want to delete ${2}? (yN)" -n 1 -r
+    echo    # (optional) move to a new line
+    if [[ $REPLY =~ ^[Yy]$ ]]
+    then
+      cd /data/domains/${2}
+      libre stop
+      libre disable
+      cd /data/domains
+      tar cvzf ${2}.tgz ./${2}
+      if [ -f ./${2}.tgz ]; then
+	if [ ! -d /data/trash/ ]; then
+	  mkdir /data/trash/
+	fi
+        mv ${2}.tgz /data/trash/
+        rm -rf /data/domains/${2}
+        rm -rf /system/haproxy/certs/${2}
+        rm /system/haproxy/haproxy/certs/${2}.pem
+      fi
+    fi;;
+  getsize)
+    # check the current size
+    if [ $# -ne 2 ]; then
+      echo "getsize requires a domainname argument."
+      exit 1
+    fi
+    echo $(du -hs /data/domains/${2}) |cut -d ' ' -f 1;;
+  *)
+    show_usage
+esac

utils/mail-mon.sh

+#!/bin/bash -eux
+
+/usr/bin/journalctl --since '1 hour ago' | grep postfix/cleanup | grep "from=" | sed -n 's/.*from=<\(.*\)> to=<\(.*\)> pro.*/\1/p' | sort |uniq -c | sort | awk 'BEGIN {FS=" ";} {printf "mail_sent{domain_name=\"%s\"} %s\n", $2, $1}' > /system/metrics-collection/textfiles/mail.prom

utils/migrate

 #!/bin/bash -eux
+#!/bin/bash -eux
 
-source /etc/environment
-
-from=$1
+hash=$1
 domain=$2
 
-ssh core@$from sudo /data/indiehosters/utils/stop_before_migration.sh $domain $IP
+cd /data/domains/
+wget https://wader.indie.host/migrate/$hash
+unzip $hash
+rm $hash
+
+cd $domain
 
-mkdir /data/domains/$domain
-scp core@${from}:${domain}.tgz /data/domains/$domain
-cd /data/domains/$domain
-tar xvzf ${domain}.tgz
-rm ${domain}.tgz
+cp TLS/$domain.pem /system/haproxy/haproxy/certs
 
 systemctl start u@$domain
 systemctl enable u@$domain

utils/provision.sh → utils/provision

 #!/usr/bin/env bash
-# Provision an application for a user for IndiePaaS
+# Provision an application for a user for LibrePaaS
 #
 # This file:
 #  - Registers the domain name to NameCheap
-#  - Generates the TLS certificate associated
 #  - Configures the DNS
-#  - Configures the mail forwarding
 #
 # Version 0.0.3
 #
@@ -13,7 +11,7 @@
 #  - Pierre Ozoux (pierre-o.fr)
 #
 # Usage:
-#  LOG_LEVEL=7 ./provision.sh -e test@test.org -a known -u example.org -g -b -c
+#  LOG_LEVEL=7 ./provision -a github.com/indiehosters/known -u example.org -g -b -c
 #
 # Licensed under AGPLv3
 
@@ -28,11 +26,13 @@ LOG_LEVEL="${LOG_LEVEL:-6}" # 7 = debug -> 0 = emergency
 # opts & defaults from. The parsing is unforgiving so be precise in your syntax
 read -r -d '' usage <<-'EOF'
   -u   [arg] URL to process. Required.
-  -a   [arg] Application to install. (in the form github.com/indiehosters/wordpress)
+  -a   [arg] Application to install. (in the form github.com/indiehosters/wordpress or wordpress in REPO_MODE)
+  -t   [arg] Checkout a specific tag or branch from the application repo. default to master
+  -e   [arg] Specify the email of the application admin 
   -s         Start the application right away.
   -b         Buys the associated domain name.
   -i         Configure OpenDKIM.
-  -c         Configures DNS on Namecheap.
+  -c         Configures DNS if possible.
   -d         Enables debug mode
   -h         This page
 EOF
@@ -41,8 +41,8 @@ EOF
 #####################################################################
 
 source /etc/environment
-source /data/indiehosters/utils/helpers
-source /data/indiehosters/utils/configure_dkim_dns
+source /opt/bin/helpers
+source /opt/bin/configure_dkim_dns
 
 function buy_domain_name () {
 
@@ -105,16 +105,54 @@ function buy_domain_name () {
 }
 
 function application () {
-  export MAIL_PASS=`tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs`
-  export MAIL_USER="noreply.${arg_u}@${MAIL_DOMAIN}"
-  export URL=${arg_u}
-  /data/indiehosters/utils/add_mailbox.sh ${MAIL_USER} ${MAIL_PASS}
 
-  git clone https://${arg_a}.git /data/domains/${arg_u}
+  #We check if a APP_REPO_URL was specified
+
+  if [ -z ${APP_REPO_URL:-} ]; then
+    warning "NO repo URL specified, using argument as full URL"
+    git_url=https://${arg_a}.git
+  else
+    warning "REPO specified, using argument as app name"
+    git_url=https://${APP_REPO_URL}/${arg_a}.git
+  fi
+  
+  #Define the tag/branch 
+  
+  git clone ${git_url} -b ${arg_t} /data/domains/${arg_u} 
+
   cd /data/domains/${arg_u}
-  ./install
+  
+  if [ -f ./scripts/install ]; then
+    #domain
+    export URL=${arg_u} 
+    #admin email
+    if [ -z "${arg_e}" ]; then
+      warning "No admin_email specified with -e , using default hoster email"
+    else
+      export ADMIN_EMAIL=${arg_e}
+      debug " admin email is ${ADMIN_EMAIL} "
+    fi
+
+    if [ -z ${MAIL_DOMAIN:-} ]; then
+      warning "you have no email server setup, we'll print a random configuration in your application. Make sure to check the parameters for your app to send proper emails."
+      warning "To stop having this warning, please configure your libre.sh to be abble to create email accounts."
+      warning "You can also contact support@indie.host to setup an email account for you"
+      export MAIL_PASS="randompass"
+      export MAIL_USER="example@indie.host"
+      export MAIL_DOMAIN="indie.host"
+      export MAIL_HOST="mail.indie.host"
+      export MAIL_PORT="587"
+    else
+      echo "using MAIL_DOMAIN from server env"
+      #export MAIL_PASS=`tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs`
+      #export MAIL_USER="noreply.${arg_u}@${MAIL_DOMAIN}"
+      #/opt/bin/add_mailbox ${MAIL_USER} ${MAIL_PASS}
+    fi
+    ./scripts/install
+  fi
 }
 
+
 function start () {
   systemctl start u@${arg_u}
   systemctl enable u@${arg_u}
@@ -190,6 +228,8 @@ fi
 
 [ -z "${arg_u}" ]     && help      "URL is required."
 [ -z "${LOG_LEVEL}" ] && emergency "Cannot continue without LOG_LEVEL."
+# tags/branch for modules 
+[ -z "${arg_t}" ]     && arg_t=master
 
 
 ### Runtime
@@ -197,7 +237,7 @@ fi
 
 # Exit on error. Append ||true if you expect an error.
 # set -e is safer than #!/bin/bash -e because that is neutralised if
-# someone runs your script like `bash yourscript.sh`
+# someone runs your script like `bash yourscript`
 set -o errexit
 set -o nounset
 

utils/restart

-systemctl_commands
\ No newline at end of file

utils/start

-systemctl_commands
\ No newline at end of file

utils/status

-systemctl_commands
\ No newline at end of file

utils/stop

-systemctl_commands
\ No newline at end of file

utils/systemctl_commands

-#!/bin/bash
-
-domain=`pwd | cut -d'/' -f4`
-systemctl `basename "$0"` u@$domain

utils/test-domain.sh

+#!/bin/bash
+cd /data/domains
+my_ip=`curl http://ipv4.icanhazip.com/`
+echo "My IP is $my_ip"
+for domain in `ls .`; do
+  domain_ip=`host ${domain} | awk '/has address/ { print $4 }'`
+  if [[ "${domain_ip}" != "${my_ip}" ]]; then
+    echo "$domain has this IP: $domain_ip"
+  fi
+done