From c3b5cc6061db180ceb6988961de8de79af27da24 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Tue, 19 Sep 2017 10:53:37 +0200 Subject: [PATCH] switch from mysql to pgsql --- conf/weblate.cnf | 5 -- scripts/backup | 8 ++-- scripts/install | 117 +++++++++++++++++++++-------------------------- scripts/restore | 19 ++++---- 4 files changed, 64 insertions(+), 85 deletions(-) delete mode 100644 conf/weblate.cnf diff --git a/conf/weblate.cnf b/conf/weblate.cnf deleted file mode 100644 index 4e61880..0000000 --- a/conf/weblate.cnf +++ /dev/null @@ -1,5 +0,0 @@ -[mysqld] -sql-mode=STRICT_TRANS_TABLES -innodb_large_prefix=on -innodb_file_format=barracuda -innodb_file_per_table=on diff --git a/scripts/backup b/scripts/backup index 1eb88fe..73ae09c 100755 --- a/scripts/backup +++ b/scripts/backup @@ -30,7 +30,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get $app final_path) domain=$(ynh_app_setting_get $app domain) db_name=$(ynh_app_setting_get $app db_name) -db_pwd=$(ynh_app_setting_get $app mysqlpwd) +db_pwd=$(ynh_app_setting_get $app pgsqlpwd) #================================================= # STANDARD BACKUP STEPS @@ -47,14 +47,12 @@ ynh_backup "$final_path" "${backup_dir}$final_path" ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" "${backup_dir}/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= -# BACKUP THE MYSQL DATABASE +# BACKUP THE PostgreSQL DATABASE #================================================= -ynh_mysql_dump_db "$db_name" > db.sql +ynh_psql_dump_db "$db_name" > db.sql ynh_backup "db.sql" "${backup_dir}/db.sql" -ynh_backup "/etc/mysql/conf.d/$app.cnf" "${backup_dir}/etc/mysql/conf.d/$app.cnf" - #================================================= # SPECIFIC BACKUP #================================================= diff --git a/scripts/install b/scripts/install index a09b850..5c7c408 100755 --- a/scripts/install +++ b/scripts/install @@ -42,26 +42,26 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # Normalize the url path syntax -path_url=$(ynh_normalize_url_path $path_url) +path_url=$(ynh_normalize_url_path "$path_url") # Check web path availability -ynh_webpath_available $domain $path_url +ynh_webpath_available "$domain" "$path_url" # Register (book) web path -ynh_webpath_register $app $domain $path_url +ynh_webpath_register "$app" "$domain" "$path_url" final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" -mkdir -p $final_path +mkdir -p "$final_path" #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_app_setting_set $app domain $domain -ynh_app_setting_set $app path $path_url -ynh_app_setting_set $app admin $admin -ynh_app_setting_set $app is_public $is_public +ynh_app_setting_set "$app" domain "$domain" +ynh_app_setting_set "$app" path "$path_url" +ynh_app_setting_set "$app" admin "$admin" +ynh_app_setting_set "$app" is_public "$is_public" #================================================= # STANDARD MODIFICATIONS @@ -73,33 +73,22 @@ ynh_app_setting_set $app is_public $is_public ynh_install_app_dependencies libxml2-dev libxslt-dev libfreetype6-dev \ libjpeg-dev libz-dev libyaml-dev python-dev python-pip python-virtualenv \ - libmysqlclient-dev uwsgi + postgresql python-psycopg2 uwsgi #================================================= -# CREATE A MYSQL DATABASE +# CREATE A PostgreSQL DATABASE #================================================= -# If your app uses a MySQL database, you can use these lines to bootstrap -# a database, an associated user and save the password in app settings -db_name=$(ynh_sanitize_dbid $app) -ynh_app_setting_set $app db_name $db_name -ynh_mysql_setup_db $db_name $db_name +ynh_psql_test_if_first_run -# https://docs.weblate.org/en/latest/admin/install.html#unicode-issues-in-mysql -# http://mechanics.flite.com/blog/2014/07/29/using-innodb-large-prefix-to-avoid-error-1071/ -ynh_mysql_execute_as_root "ALTER DATABASE $db_name CHARACTER SET utf8mb4;" +db_name=$(ynh_sanitize_dbid "$app") +db_user_pwd=$(ynh_string_random) +# Initialize database and store postgres password for upgrade +ynh_psql_create_db "$db_name" "$app" "$db_user_pwd" +ynh_app_setting_set "$app" db_name "$db_name" +ynh_app_setting_set "$app" psqlpwd "$db_pwd" -cp ../conf/weblate.cnf /etc/mysql/conf.d/$app.cnf -searchString="!includedir /etc/mysql/conf.d/" -if grep -Fxq "$searchString" /etc/mysql/my.cnf -then - echo "MySQL alread includes conf.d files" -else - echo "MySQL do not includes conf.d files, edditing /etc/mysql/my.cnf" - echo "$searchString" >> /etc/mysql/my.cnf -fi - -systemctl restart mysql +systemctl reload postgres #================================================= # NGINX CONFIGURATION @@ -113,7 +102,7 @@ ynh_add_nginx_config #================================================= # Create a system user -ynh_system_user_create $app +ynh_system_user_create "$app" #================================================= # SPECIFIC SETUP @@ -122,36 +111,36 @@ ynh_system_user_create $app #================================================= # Copy Files -cp ../conf/uwsgi.ini $final_path/uwsgi.ini -ynh_replace_string "__NAME__" "$app" $final_path/uwsgi.ini -ynh_replace_string "__FINALPATH__" "$final_path" $final_path/uwsgi.ini +cp ../conf/uwsgi.ini "$final_path/uwsgi.ini" +ynh_replace_string "__NAME__" "$app" "$final_path/uwsgi.ini" +ynh_replace_string "__FINALPATH__" "$final_path" "$final_path/uwsgi.ini" # Config service mkdir -p /etc/uwsgi/apps-enabled/ -ln -s $final_path/uwsgi.ini /etc/uwsgi/apps-enabled/$app.uwsgi.ini +ln -s "$final_path/uwsgi.ini" "/etc/uwsgi/apps-enabled/$app.uwsgi.ini" -cp ../conf/uwsgi_service /etc/systemd/system/$app.uwsgi.service -ynh_replace_string "__NAME__" "$app" /etc/systemd/system/$app.uwsgi.service -ynh_replace_string "__FINALPATH__" "$final_path" /etc/systemd/system/$app.uwsgi.service +cp ../conf/uwsgi_service "/etc/systemd/system/$app.uwsgi.service" +ynh_replace_string "__NAME__" "$app" "/etc/systemd/system/$app.uwsgi.service" +ynh_replace_string "__FINALPATH__" "$final_path" "/etc/systemd/system/$app.uwsgi.service" # Start service -systemctl enable $app.uwsgi.service -systemctl restart $app.uwsgi.service +systemctl enable "$app.uwsgi.service" +systemctl restart "$app.uwsgi.service" # Add weblate.uwsgi as a service -yunohost service add $app.uwsgi.service +yunohost service add "$app.uwsgi.service" #================================================= # PIP INSTALLATION #================================================= -virtualenv ${final_path}/venv +virtualenv "${final_path}/venv" #run source in a 'sub shell' ( set +eu - source ${final_path}/venv/bin/activate - ${final_path}/venv/bin/pip install Weblate==2.16 - ${final_path}/venv/bin/pip install pytz python-bidi PyYaML Babel pyuca pylibravatar pydns mysqlclient + source "${final_path}/venv/bin/activate" + "${final_path}/venv/bin/pip" install Weblate==2.16 + "${final_path}/venv/bin/pip" install pytz python-bidi PyYaML Babel pyuca pylibravatar pydns ) #================================================= @@ -159,20 +148,20 @@ virtualenv ${final_path}/venv # https://docs.weblate.org/en/latest/admin/install.html#installation # TODO: use --extra-search-dir=/path/to/dists #================================================= -db_pwd=$(ynh_app_setting_get $app mysqlpwd) -admin_mail="$(ynh_user_get_info $admin mail)" +db_pwd=$(ynh_app_setting_get "$app" psqlpwd) +admin_mail=$(ynh_user_get_info "$admin" mail) key=$(ynh_string_random) -cp ../conf/settings.py $final_path/venv/lib/python2.7/site-packages/weblate/settings.py +cp ../conf/settings.py "$final_path/venv/lib/python2.7/site-packages/weblate/settings.py" -ynh_replace_string "__NAME__" "$app" $final_path/venv/lib/python2.7/site-packages/weblate/settings.py -ynh_replace_string "__DB_PWD__" "$db_pwd" $final_path/venv/lib/python2.7/site-packages/weblate/settings.py -ynh_replace_string "__ADMIN__" "$admin" $final_path/venv/lib/python2.7/site-packages/weblate/settings.py -ynh_replace_string "__ADMINMAIL__" "$admin_mail" $final_path/venv/lib/python2.7/site-packages/weblate/settings.py -ynh_replace_string "__DOMAIN__" "$domain" $final_path/venv/lib/python2.7/site-packages/weblate/settings.py -ynh_replace_string "__KEY__" "$key" $final_path/venv/lib/python2.7/site-packages/weblate/settings.py -ynh_replace_string "__PATHURL__" "$path_url" $final_path/venv/lib/python2.7/site-packages/weblate/settings.py -ynh_replace_string "__FINALPATH__" "$final_path" $final_path/venv/lib/python2.7/site-packages/weblate/settings.py +ynh_replace_string "__NAME__" "$app" "$final_path/venv/lib/python2.7/site-packages/weblate/settings.py" +ynh_replace_string "__DB_PWD__" "$db_pwd" "$final_path/venv/lib/python2.7/site-packages/weblate/settings.py" +ynh_replace_string "__ADMIN__" "$admin" "$final_path/venv/lib/python2.7/site-packages/weblate/settings.py" +ynh_replace_string "__ADMINMAIL__" "$admin_mail" "$final_path/venv/lib/python2.7/site-packages/weblate/settings.py" +ynh_replace_string "__DOMAIN__" "$domain" "$final_path/venv/lib/python2.7/site-packages/weblate/settings.py" +ynh_replace_string "__KEY__" "$key" "$final_path/venv/lib/python2.7/site-packages/weblate/settings.py" +ynh_replace_string "__PATHURL__" "$path_url" "$final_path/venv/lib/python2.7/site-packages/weblate/settings.py" +ynh_replace_string "__FINALPATH__" "$final_path" "$final_path/venv/lib/python2.7/site-packages/weblate/settings.py" #================================================= @@ -181,9 +170,9 @@ ynh_replace_string "__FINALPATH__" "$final_path" $final_path/venv/lib/python2.7/ #========================================== ( set +eu - source ${final_path}/venv/bin/activate + source "${final_path}/venv/bin/activate" export DJANGO_SETTINGS_MODULE="weblate.settings" - cd ${final_path} + cd "${final_path}" weblate migrate --noinput # generate static files weblate collectstatic --noinput @@ -192,8 +181,8 @@ ynh_replace_string "__FINALPATH__" "$final_path" $final_path/venv/lib/python2.7/ #================================================= # SETUP CRON #================================================= -cp ../conf/cron_weblate /etc/cron.d/$app -ynh_replace_string "__FINALPATH__" "$final_path/" /etc/cron.d/$app +cp ../conf/cron_weblate "/etc/cron.d/$app" +ynh_replace_string "__FINALPATH__" "$final_path/" "/etc/cron.d/$app" #================================================= # STORE THE CHECKSUM OF THE CONFIG FILE @@ -209,7 +198,7 @@ ynh_store_file_checksum "$final_path/venv/lib/python2.7/site-packages/weblate/se #================================================= # Set permissions to app files -chown -R root: $final_path +chown -R root: "$final_path" #================================================= # SETUP LOGROTATE @@ -222,15 +211,15 @@ ynh_use_logrotate # SETUP SSOWAT #================================================= -if [ $is_public -eq 0 ] +if [ "$is_public" -eq 0 ] then # Remove the public access - ynh_app_setting_delete $app skipped_uris + ynh_app_setting_delete "$app" skipped_uris fi # Make app public if necessary -if [ $is_public -eq 1 ] +if [ "$is_public" -eq 1 ] then # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set $app unprotected_uris "/" + ynh_app_setting_set "$app" unprotected_uris "/" fi #================================================= diff --git a/scripts/restore b/scripts/restore index c486f17..e2a8157 100755 --- a/scripts/restore +++ b/scripts/restore @@ -55,17 +55,6 @@ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file "$final_path" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= - -ynh_restore_file "/etc/mysql/conf.d/$app.cnf" -systemctl restart mysql - -db_pwd=$(ynh_app_setting_get $app mysqlpwd) -ynh_mysql_setup_db $db_name $db_name $db_pwd -ynh_mysql_connect_as $db_name $db_pwd $db_name < ./db.sql - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -73,6 +62,14 @@ ynh_mysql_connect_as $db_name $db_pwd $db_name < ./db.sql # Create the dedicated user (if not existing) ynh_system_user_create $app +#================================================= +# RESTORE THE PostgreSQL DATABASE +#================================================= + +db_pwd=$(ynh_app_setting_get $app pgsqlpwd) +ynh_psql_setup_db $db_name $db_name $db_pwd +ynh_psql_connect_as $db_name $db_pwd $db_name < ./db.sql + #================================================= # RESTORE USER RIGHTS #=================================================