Fix install script

conf/app.src

@@ -1,6 +0,0 @@
-SOURCE_URL=https://github.com/diaspora/diaspora/archive/v0.7.12.0.zip
-SOURCE_SUM=8bed8a84a336d51a7983636eab9670d85fdd1fc5
-SOURCE_SUM_PRG=sha256
-SOURCE_FORMAT=zip
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=

conf/database.yml

@@ -1,27 +1,28 @@
+postgresql: &postgresql
+  adapter: postgresql
+  host: "localhost"
+  port: 5432
+  username: "{{ app }}"
+  password: "{{ db_pass }}"
+  encoding: unicode
+
 mysql: &mysql
   adapter: mysql2
   host: "localhost"
   port: 3306
-  username: "DBUSERTOCHANGE"
+  username: "root"
-  password: "DBPASSTOCHANGE"
+  password: ""
 #  socket: /tmp/mysql.sock
-  charset: utf8mb4
+  encoding: utf8mb4
   collation: utf8mb4_bin
 
-postgres: &postgres
-  adapter: postgresql
-  host: localhost
-  port: 5432
-  username: postgres
-  password:
-  encoding: unicode
 
-# Comment the the mysql line and uncomment the postgres line
+# Comment the postgresql line and uncomment the mysql line
-# if you want to use postgres
+# if you want to use mysql
 common: &common
   # Choose one of the following
-  <<: *mysql
+  <<: *postgresql
-  #<<: *postgres
+  #<<: *mysql
 
   # Should match environment.sidekiq.concurrency
   #pool: 25
@@ -31,10 +32,9 @@ common: &common
 ##################################################
 
 # Normally you don't need to touch anything here
+# ynh note: we actually do :-) how about having different database name for
+# different instances on the same postgres cluster?
 
-postgres_travis: &postgres_travis
-  adapter: postgresql
-  username: postgres
 combined: &combined
   <<: *common
 development:
@@ -42,10 +42,10 @@ development:
   database: diaspora_development
 production:
   <<: *combined
-  database: diaspora_production
+  database: {{ app }}
 test:
   <<: *combined
-  database: "diaspora_test"
+  database: diaspora_test
 integration1:
   <<: *combined
   database: diaspora_integration1

conf/diaspora_worker1.service

@@ -1,18 +0,0 @@
-[Unit]
-Description=Diaspora social network (worker %i)
-PartOf=diaspora.target
-StopWhenUnneeded=true
-
-[Service]
-User=diaspora
-WorkingDirectory=/var/www/diaspora
-Environment=RAILS_ENV=production
-ExecStart=/var/www/diaspora/.rvm/scripts/extras/chruby.sh 2.2 -- bin/bundle exec sidekiq
-Restart=always
-CPUAccounting=true
-MemoryAccounting=true
-BlockIOAccounting=true
-
-[Install]
-WantedBy=diaspora.target
-DefaultInstance=worker1

conf/diaspora_ynh

@@ -1,224 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: diaspora_ynh
-# Required-Start: $remote_fs $syslog mysql redis-server
-# Required-Stop: $remote_fs $syslog mysql redis-server
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Diaspora application server
-# Description: Start / stop the Diaspora app server
-### END INIT INFO
-
-# Author: FABIAN Tamas Laszlo <giganetom@gmail.com>
-# Updated: Pirate Praveen <praveen@debian.org>
-# Updated: aymhce <aymhce@gmail.com>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-# Note: /usr/local/bin for foreman gem
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
-DESC="Diaspora application server"
-NAME=diaspora
-DIASPORA_HOME="/var/www/diaspora"
-
-STARTSCRIPT="./script/server"
-
-LOGFILE=$DIASPORA_HOME/log/startscript.log
-SCRIPTNAME=$0
-USER=diaspora
-STARTUP_TIMEOUT=100
-
-. /lib/init/vars.sh
-. /lib/lsb/init-functions
-
-check_unicorn() {
-    pgrep -f "unicorn_rails master"
-}
-
-check_sidekiq() {
-    pgrep -f "sidekiq 3"
-}
-
-check_foreman() {
-    pgrep -f "foreman-runner"
-}
-
-check_foreman_start() {
-    pgrep -f "foreman start"
-}
-
-check_script_server() {
-    pgrep -f "script/server"
-}
-
-do_start()
-{
-    if ! touch $LOGFILE; then
-        log_failure_msg "Could not touch logfile"
-        return 2
-    fi
-
-    if ! chown $USER $LOGFILE; then
-        log_failure_msg "Could not chown logfile"
-        return 2
-    fi
-
-    if check_unicorn && check_sidekiq; then
-        log_warning_msg "Diaspora is already running"
-        return 1
-    fi
-    
-    if check_foreman || check_foreman_start || check_script_server; then
-        log_warning_msg "Diaspora is starting"
-        return 1
-    fi
-    
-    export SERVERNAME=localhost
-    export ENVIRONMENT_URL=http://localhost
-    export RAILS_ENV=production
-    export DB=mysql
-
-    cd $DIASPORA_HOME
-    sudo su - $USER -c " . ~/.bashrc && cd $DIASPORA_HOME && $STARTSCRIPT >> $LOGFILE 2>&1 " &
-    if  [ $? -gt 0 ]
-    then
-        log_failure_msg "Could not run start script"
-        return 2
-    else
-        log_success_msg "Starting diaspora server..."
-        return 0
-    fi
-
-    [ "$VERBOSE" != no ] && log_action_msg "Waiting for Diaspora processes... "
-    c=0
-    while ! check_unicorn > /dev/null || ! check_sidekiq > /dev/null; do
-        if [ $c -gt $STARTUP_TIMEOUT ]; then
-            log_failure_msg "Timeout waiting for Diaspora processes"
-            return 2
-        fi
-        c=`expr $c + 1`
-        sleep 1
-        [ "$VERBOSE" != no ] && echo -n "."
-    done
-    [ "$VERBOSE" != no ] && log_action_end_msg 0
-}
-
-do_stop()
-{
-    for i in `check_unicorn`; do
-        [ "$VERBOSE" != no ] && log_action_msg "Killing unicorn master with PID $i"
-        kill -TERM $i
-        [ "$VERBOSE" != no ] && log_action_end_msg $?
-    done
-
-    for i in `check_sidekiq`; do
-        [ "$VERBOSE" != no ] && log_action_msg "Killing sidekiq with PID $i"
-        kill -TERM $i
-        [ "$VERBOSE" != no ] && log_action_end_msg $?
-    done
-
-    return 0
-}
-
-case "$1" in
-  start)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-    do_start
-    case "$?" in
-        0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-        *) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-    ;;
-  stop)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-    do_stop
-    case "$?" in
-        0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-        2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-    ;;
-  status)
-    log_daemon_msg 'Checking for running Diaspora processes'
-
-    if ! check_unicorn
-    then
-        log_action_msg "unicorn not found"
-        unicorn_running=false
-    else
-        for i in `check_unicorn`; do
-            log_action_msg "Found unicorn master with PID $i"
-            unicorn_running=true
-        done
-    fi
-
-    if ! check_foreman
-    then
-        log_action_msg "foreman not found"
-        foreman_running=false
-    else
-        for i in `check_foreman`; do
-            log_action_msg "Found foreman with pid $i"
-            foreman_running=true
-        done
-    fi
-
-    if ! check_sidekiq
-    then
-        log_action_msg "sidekiq is not found"
-        sidekiq_running=false
-    else
-        for i in `check_sidekiq`; do
-           log_action_msg "Found sidekiq with PID $i"
-            sidekiq_running=true
-        done
-    fi
-
-    if $foreman_running && ! $unicorn_running; then
-        log_action_msg "Diaspora is starting, check after some time..."
-        log_end_msg 0
-        return 0
-    fi
-    if $unicorn_running && $sidekiq_running; then
-        log_action_msg "Diaspora health is OK"
-        log_end_msg 0
-    else
-        if $unicorn_running; then
-            log_failure_msg "Unicorn is RUNNING, but sidekiq is DOWN!"
-            log_end_msg 1
-            return 1
-        fi
-        if $sidekiq_running; then
-            log_failure_msg "Sidekiq is RUNNING, but unicorn is DOWN!"
-            log_end_msg 1
-            return 1
-        fi
-        log_daemon_msg "All Diaspora processes are DOWN"
-        log_end_msg 0
-    fi
-    ;;
-  restart|force-reload)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Restarting $DESC" "$NAME"
-    do_stop
-    ret=$?
-    sleep 5
-    case "$ret" in
-      0|1)
-        do_start
-        case "$?" in
-            0) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-            1) [ "$VERBOSE" != no ] && log_failure_msg "old process is still running" && log_end_msg 1 ;;
-            *) [ "$VERBOSE" != no ] && log_failure_msg "failed to start" && log_end_msg 1 ;;
-        esac
-        ;;
-      *)
-        [ "$VERBOSE" != no ] && log_failure_msg "failed to stop"
-        [ "$VERBOSE" != no ] && log_end_msg 1
-        ;;
-    esac
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-    exit 3
-    ;;
-esac
-
-:

conf/piotr.kuczynski@gmail.com.pgp

@@ -0,0 +1,132 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+iWTuv7mXY0bNG+s=
+=SF+D
+-----END PGP PUBLIC KEY BLOCK-----

manifest.json

@@ -16,7 +16,7 @@
   "requirements": {
     "yunohost": ">= 3.6.0"
   },
-  "multi_instance": "false",
+  "multi_instance": "true",
   "services": [
     "nginx",
     "php7-fpm",

scripts/_common.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
-pkg_dependencies="build-essential cmake libssl-dev libcurl4-openssl-dev libxml2-dev libxslt-dev imagemagick ghostscript curl libmagickwand-dev git libpq-dev redis-server nodejs"
+pkg_dependencies="build-essential cmake libssl-dev libcurl4-openssl-dev libxml2-dev libxslt-dev imagemagick ghostscript curl libmagickwand-dev git libpq-dev redis-server nodejs postgresql bison "
+ruby_build_dependencies="bison libffi-dev libgdbm-dev libncurses5-dev libsqlite3-dev libyaml-dev pkg-config sqlite3 zlib1g-dev libgmp-dev libreadline-dev libssl-dev"

scripts/install

@@ -1,5 +1,13 @@
 #!/bin/bash
 
+# TODO 
+# - check logrotate
+# - which service to register to ynuhosto? diaspora.target only ? All of them ?
+# - backup / restore
+# - changeurl ? Is that possible ? or even a good idea ?
+# - make an admin automatically
+# - integration with ssowat? Or not?
+
 #=================================================
 # GENERIC START
 #=================================================
@@ -57,9 +65,10 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 # STORE SETTINGS FROM MANIFEST
 #=================================================
 ynh_script_progression --message="Saving app settings..." --time --weight=1
-ynh_app_setting_set $app domain $domain
+ynh_app_setting_set --app=$app --key=domain --value=$domain
-ynh_app_setting_set $app path $path_url
+ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set $app is_public $is_public
+ynh_app_setting_set --app=$app --key=is_public --value=$is_public
+ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -68,8 +77,8 @@ ynh_app_setting_set $app is_public $is_public
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --time --weight=1
+ynh_script_progression --message="Installing dependencies..." --time --weight=27
-ynh_install_app_dependencies $pkg_dependencies
+ynh_install_app_dependencies $pkg_dependencies $ruby_build_dependencies
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE
@@ -79,83 +88,115 @@ db_name=$(ynh_sanitize_dbid $app)
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_psql_test_if_first_run
 ynh_psql_setup_db $db_name $db_name
+db_pass=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Creating database..." --time --weight=1
+ynh_script_progression --message="Creating user..." --time --weight=1
 # Create a system user
-ynh_system_user_create $app
+ynh_system_user_create --username=$app --home_dir=$final_path --use_shell
+mkdir -p $final_path
+chown $app:$app $final_path
 
+# SWITCH TO NEW USER UNTIL EOF
+
+#=================================================
+# INSTALL RVM AND RUBY FOR CURRENT USER
+#=================================================
+ynh_script_progression --message="Installing rvm..." --time --weight=10
+sudo -u $app gpg --import ../conf/piotr.kuczynski\@gmail.com.pgp ../conf/mpapis\@gmail.com.pgp
+pushd $final_path
+sudo -u $app curl -sSL https://get.rvm.io | sudo -u $app bash -s stable
+ynh_script_progression --message="Installing ruby 2.4 (this can take a long time)..." --time --weight=230
+sudo -u $app $final_path/.rvm/bin/rvm autolibs read-fail
+sudo -u $app $final_path/.rvm/bin/rvm install 2.4
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+# Download, check integrity, unucompress and patch the source from app.src
+ynh_script_progression --message="Download the sources..." --time --weight=16
+sudo -u $app git clone https://github.com/diaspora/diaspora.git -b v0.7.12.0
+popd
 
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+#=================================================
-# Download, check integrity, uncompress and patch the source from app.src
+# EXPORT VARIABLES FOR TEMPLATING
-su -l $app -s /bin/bash
+#=================================================
-cd ~
+export app
-git clone -b v0.7.12.0 https://github.com/diaspora/diaspora.git
+export domain
-cd diaspora
+export path_url
-config/database.yml
+export db_pass
-cp config/diaspora.yml
+export final_path
-curl -L https://s.diaspora.software/1t | bash
+
-echo [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" | tee ~/.bashrc
+#=================================================
-gem install bundler
+# CONFIGURE DIASPORA
-RAILS_ENV=production bin/bundle install --jobs $(nproc) --deployment --without test development --with mysql
+#=================================================
+ynh_script_progression --message="Configure diaspora..." --time --weight=1
+ynh_render_template ../conf/diaspora.yml $final_path/diaspora/config/diaspora.yml
+ynh_render_template ../conf/database.yml $final_path/diaspora/config/database.yml
+
+#=================================================
+# Bundle the ruby app
+#=================================================
+pushd $final_path/diaspora
+ynh_script_progression --message="bundle the app..." --time --weight=1000
+# here we *absolutely* need bash (not dash) because dash does not understand what rvm puts in .profile
+# (wtf rvm for assuming everybody uses bash as default shell??)
+# we also need a login shell to make sure .profile is loaded
+sudo -u $app /bin/bash --login << EOF
+rvm use --default 2.4
+rvm 2.4 do gem install bundler
+script/configure_bundler
+bin/bundle install --full-index --with=postgresql
+EOF
+ynh_script_progression --message="Create db schema..." --time --weight=22
+sudo -u $app /bin/bash --login << EOF
+RAILS_ENV=production bundle exec rake db:migrate
+EOF
+
+#=================================================
+# ASSETS PRECOMPILATION
+#=================================================
+ynh_script_progression --message="Precompile assets..." --time --weight=400
+sudo -u $app /bin/bash --login << EOF
+RAILS_ENV=production bin/rake assets:precompile
+EOF
+popd
 
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-
+# TODO serve public/ ?
 # Create a dedicated nginx config
+ynh_script_progression --message="configure nginx..." --time --weight=1
 ynh_add_nginx_config
 
-#=================================================
-# SPECIFIC SETUP
-#=================================================
-
 #=================================================
 # SETUP SYSTEMD
 #=================================================
-
 # Create a dedicated systemd config
-ynh_systemd_config
+# TODO add service in yunohost panel ?
-
+ynh_script_progression --message="configure systemd unit..." --time --weight=1
-#=================================================
+ynh_render_template ../conf/diaspora_sidekiq.service /etc/systemd/system/${app}_sidekiq.service
-# SETUP APPLICATION WITH CURL
+ynh_render_template ../conf/diaspora_web.service /etc/systemd/system/${app}_web.service
-#=================================================
+ynh_render_template ../conf/diaspora.tmpfiles.d /etc/tmpfiles.d/${app}.conf
-
+ynh_render_template ../conf/diaspora.target /etc/systemd/system/${app}.target
-# Set right permissions for curl install
+systemctl daemon-reload
-chown -R $app: $final_path
+systemd-tmpfiles --create
-
+systemctl enable ${app}.target ${app}_sidekiq.service ${app}_web.service
-# Set the app as temporarily public for curl call
+systemctl restart ${app}.target
-ynh_app_setting_set $app unprotected_uris "/"
-# Reload SSOwat config
-yunohost app ssowatconf
-
-# Reload Nginx
-systemctl reload nginx
-
-# Installation with curl
-ynh_local_curl "/INSTALL_PATH" "key1=value1" "key2=value2" "key3=value3"
 
 #=================================================
 # STORE THE CHECKSUM OF THE CONFIG FILE
 #=================================================
-
 # Calculate and store the config file checksum into the app settings
-ynh_store_file_checksum "$final_path/CONFIG_FILE"
+ynh_store_file_checksum --file="$final_path/diaspora/config/diaspora.yml"
+ynh_store_file_checksum --file="$final_path/diaspora/config/database.yml"
 
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chown -R root: $final_path
 
 #=================================================
 # SETUP LOGROTATE
@@ -167,7 +208,7 @@ ynh_use_logrotate
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
-
+# TODO 
 yunohost service add NAME_INIT.D --log "/var/log/FILE.log"
 
 #=================================================
@@ -188,5 +229,5 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-
+ynh_script_progression --message="Reload nginx..." --time --weight=1
 systemctl reload nginx

scripts/remove

@@ -16,7 +16,6 @@ source /usr/share/yunohost/helpers
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get $app domain)
-port=$(ynh_app_setting_get $app port)
 db_name=$(ynh_app_setting_get $app db_name)
 final_path=$(ynh_app_setting_get $app final_path)
 
@@ -25,9 +24,13 @@ final_path=$(ynh_app_setting_get $app final_path)
 #=================================================
 # STOP AND REMOVE SERVICE
 #=================================================
-
+systemctl stop ${app}.target ${app}_sidekiq.service ${app}_web.service
-# Remove the dedicated systemd config
+systemctl disable ${app}.target ${app}_sidekiq.service ${app}_web.service
-ynh_remove_systemd_config
+ynh_secure_remove --file="/etc/systemd/system/${app}_web.service"
+ynh_secure_remove --file="/etc/systemd/system/${app}_sidekiq.service"
+ynh_secure_remove --file="/etc/tmpfiles.d/${app}.conf"
+ynh_secure_remove --file="/etc/systemd/system/${app}.target"
+systemctl daemon-reload
 
 #=================================================
 # REMOVE SERVICE FROM ADMIN PANEL
@@ -39,6 +42,13 @@ then
 	yunohost service remove $app
 fi
 
+#=================================================
+# REMOVE THE POSTGRESQL DATABASE
+#=================================================
+
+# Remove a database if it exists, along with the associated user
+ynh_psql_remove_db $db_name $db_name
+
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
@@ -46,20 +56,6 @@ fi
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
 
-#=================================================
-# REMOVE THE MYSQL DATABASE
-#=================================================
-
-# Remove a database if it exists, along with the associated user
-ynh_mysql_remove_db $db_name $db_name
-
-#=================================================
-# REMOVE APP MAIN DIR
-#=================================================
-
-# Remove the app directory securely
-ynh_secure_remove "$final_path"
-
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
@@ -67,45 +63,14 @@ ynh_secure_remove "$final_path"
 # Remove the dedicated nginx config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE PHP-FPM CONFIGURATION
-#=================================================
-
-# Remove the dedicated php-fpm config
-ynh_remove_fpm_config
-
 #=================================================
 # REMOVE LOGROTATE CONFIGURATION
 #=================================================
 
 # Remove the app-specific logrotate config
+# TODO setup logrotate ?
 ynh_remove_logrotate
 
-#=================================================
-# CLOSE A PORT
-#=================================================
-
-if yunohost firewall list | grep -q "\- $port$"
-then
-	echo "Close port $port"
-	yunohost firewall disallow TCP $port 2>&1
-fi
-
-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-# REMOVE THE CRON FILE
-#=================================================
-
-# Remove a cron file
-ynh_secure_remove "/etc/cron.d/$app"
-
-# Remove a directory securely
-ynh_secure_remove "/etc/$app/"
-
-# Remove the log files
-ynh_secure_remove "/var/log/$app/"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
@@ -113,4 +78,14 @@ ynh_secure_remove "/var/log/$app/"
 #=================================================
 
 # Delete a system user
+# because we use gpg, sometimes rogue processes (gpg an d dirmngr) stays a bit,
+# preventing the deletion of the user. Hence we kill all processes belonging to $app
+pkill -9 -u `id -u $app`
 ynh_system_user_delete $app
+
+#=================================================
+# REMOVE APP MAIN DIR
+#=================================================
+# Remove the app directory securely
+ynh_secure_remove "$final_path"
+