YunoHost-Apps/writefreely_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/writefreely_ynh.git synced 2024-09-03 20:36:02 +02:00
Code Issues Activity Actions

Merge pull request #70 from YunoHost-Apps/testing

Browse source 
Upgrade to 0.11.1
This commit is contained in:
yalh76 2019-11-22 02:11:56 +01:00 • committed by GitHub
commit 4bdc91d0ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 115 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -13,7 +13,7 @@ Can be run as Single User Blog or Multi User Instance.
Each User can be limited from 1 to unlimited blogs. Each User can be limited from 1 to unlimited blogs.
**Shipped version:** v0.10.0 **Shipped version:** v0.11.1
## Important points to read before installing ## Important points to read before installing
@ -49,7 +49,6 @@ If User Mode is configured Multiple users, the app be used by multiple users
* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/writefreely%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/writefreely/) * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/writefreely%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/writefreely/)
* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/writefreely%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/writefreely/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/writefreely%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/writefreely/)
* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/writefreely%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/writefreely/)
## Limitations ## Limitations

62
arm64_compilation Normal file
View file

@ -0,0 +1,62 @@
#!/bin/bash
GO_VERSION="1.13.4"
NODE_VERSION="v13.1.0"
WRITEFREELY_VERSION="0.11.1"
# Install Go for ARM64
cd
rm -rf ~/gitwork
wget https://dl.google.com/go/$GO_VERSION.linux-arm64.tar.gz
tar -zxvf go$GO_VERSION.linux-arm64.tar.gz
rm go$GO_VERSION.linux-arm64.tar.gz
rm -rf /usr/local/go/
mv go /usr/local/
export GOROOT=/usr/local/go
mkdir -p ~/gitwork/go/src
mkdir ~/gitwork/go/bin
mkdir ~/gitwork/go/pkg
export GOPATH=~/gitwork/go
export PATH=$PATH:/usr/local/go/bin
export PATH="$PATH:$GOPATH/bin"
go version
# Install Nodejs for ARM64
wget https://nodejs.org/dist/v13.1.0/node-$NODE_VERSION-linux-arm64.tar.xz
tar -xvf node-$NODE_VERSION-linux-arm64.tar.xz
rm node-$NODE_VERSION-linux-arm64.tar.xz
rm -rf /usr/local/node-$NODE_VERSION-linux-arm64/
cp -rp node-$NODE_VERSION-linux-arm64 /usr/local/
rm -rf node-$NODE_VERSION-linux-arm64
ln -s /usr/local/node-$NODE_VERSION-linux-arm64 /usr/local/node
export PATH=$PATH:/usr/local/node/bin
node --version
# Build writefreely
go get -u github.com/go-bindata/go-bindata/...
go get -d github.com/writeas/writefreely/cmd/writefreely
cd $GOPATH/src/github.com/writeas/writefreely
git checkout -b v$WRITEFREELY_VERSION
# If running Go 1.11+
export GO111MODULE=on
make build # Compile the application
# Create the package
cd
wget https://github.com/writeas/writefreely/releases/download/v0.11.1/writefreely_$WRITEFREELY_VERSION_linux_amd64.tar.gz
rm -rf writefreely
tar -zxvf writefreely_$WRITEFREELY_VERSION_linux_amd64.tar.gz
rm writefreely_$WRITEFREELY_VERSION_linux_amd64.tar.gz
rm -rf writefreely/writefreely
cp $GOPATH/src/github.com/writeas/writefreely/cmd/writefreely/writefreely writefreely/writefreely
tar -zcvf writefreely_$WRITEFREELY_VERSION_linux_arm64.tar.gz writefreely

6
conf/arm.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://github.com/writeas/writefreely/releases/download/v0.10.0/writefreely_0.10.0_linux_arm7.tar.gz SOURCE_URL=https://github.com/writeas/writefreely/releases/download/v0.11.1/writefreely_0.11.1_linux_arm7.tar.gz
SOURCE_SUM=a746db116272d5ded74cd5556b56ed2f2c4f6af1785f44e6254b63adee0a7d92 SOURCE_SUM=d13d95d65bdae06a71a370acf80a6bb709949ab28e9d80034da9c4d943173698
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=

6
conf/arm64.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://github.com/YunoHost-Apps/writefreely_ynh/releases/download/v0.10.0/writefreely_0.10.0_linux_arm64.tar.gz SOURCE_URL=https://github.com/YunoHost-Apps/writefreely_ynh/releases/download/v0.11.1/writefreely_0.11.1_linux_arm64.tar.gz
SOURCE_SUM=da7593fad065e17dae12ff64f501143694d585b4f0e021a60d25b02e58d127d2 SOURCE_SUM=3976b00bf8dd0a068ed4b8c6952c6abc5702c2f13b04eb6b39e289ae22336606
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=

10
conf/config.ini
View file

@ -1,9 +1,10 @@
[server] [server]
hidden_host = hidden_host =
port = __PORT__ port = __PORT__
bind = localhost bind = 127.0.0.1
tls_cert_path = tls_cert_path =
tls_key_path = tls_key_path =
autocert = false
templates_parent_dir = templates_parent_dir =
static_parent_dir = static_parent_dir =
pages_parent_dir = pages_parent_dir =
@ -23,9 +24,14 @@ site_name = WriteFreely
site_description = WriteFreely_Blogs site_description = WriteFreely_Blogs
host = __DOMAIN_URL__ host = __DOMAIN_URL__
theme = write theme = write
editor =
disable_js = false disable_js = false
webfonts = true webfonts = true
landing = landing =
simple_nav = false
wf_modesty = false
chorus = false
disable_drafts = false
single_user = __SINGLEUSER__ single_user = __SINGLEUSER__
open_registration = true open_registration = true
min_username_len = 3 min_username_len = 3
@ -35,3 +41,5 @@ public_stats = true
private = false private = false
local_timeline = true local_timeline = true
user_invites = user_invites =
default_visibility =

2
conf/systemd.service
View file

@ -1,5 +1,5 @@
[Unit] [Unit]
Description=Write Freely Service Description=Write Freely __APP__ Service
After=network.target After=network.target
[Service] [Service]

6
conf/x86-64.src
View file

@ -1,6 +1,6 @@
SOURCE_URL=https://github.com/writeas/writefreely/releases/download/v0.10.0/writefreely_0.10.0_linux_amd64.tar.gz SOURCE_URL=https://github.com/writeas/writefreely/releases/download/v0.11.1/writefreely_0.11.1_linux_amd64.tar.gz
SOURCE_SUM=11498cfc579b94326bdae0b61a992ba4ee3a0200a83920043c1d8ea3bdce8380 SOURCE_SUM=694ece3eb07b6d067cc895445b645374693bb1ab4f721f6a8d619c263086d82e
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "For starting a minimalist, federated blog — or an entire community.", "en": "For starting a minimalist, federated blog — or an entire community.",
"fr": "Permet de créer un blog fédéré minimaliste ou une communauté entière." "fr": "Permet de créer un blog fédéré minimaliste ou une communauté entière."
}, },
"version": "0.10.0~ynh1", "version": "0.11.1~ynh1",
"url": "https://writefreely.org", "url": "https://writefreely.org",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"maintainer": [ "maintainer": [

7
scripts/backup
View file

@ -6,6 +6,7 @@
# IMPORT GENERIC HELPERS # IMPORT GENERIC HELPERS
#================================================= #=================================================
#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
source ../settings/scripts/_common.sh source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
@ -37,14 +38,14 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
#================================================= #=================================================
ynh_print_info --message="Stopping a systemd service..." ynh_print_info --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Write Freely"
#================================================= #=================================================
# BACKUP THE APP MAIN DIR # BACKUP THE APP MAIN DIR
#================================================= #=================================================
ynh_print_info --message="Backing up the main app directory..." ynh_print_info --message="Backing up the main app directory..."
ynh_backup "$final_path" ynh_backup --src_path="$final_path"
#================================================= #=================================================
# BACKUP THE NGINX CONFIGURATION # BACKUP THE NGINX CONFIGURATION
@ -74,7 +75,7 @@ ynh_backup --src_path="/etc/systemd/system/$app.service"
#================================================= #=================================================
ynh_print_info --message="Starting a systemd service..." ynh_print_info --message="Starting a systemd service..."
ynh_systemd_action --service_name=$app --action="start" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving on"
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT

4
scripts/change_url
View file

@ -58,7 +58,7 @@ fi
#================================================= #=================================================
ynh_print_info --message="Stopping a systemd service..." ynh_print_info --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Write Freely"
#================================================= #=================================================
# MODIFY URL IN NGINX CONF # MODIFY URL IN NGINX CONF
@ -112,7 +112,7 @@ ynh_store_file_checksum --file="$final_path/config.ini"
#================================================= #=================================================
ynh_print_info --message="Starting a systemd service..." ynh_print_info --message="Starting a systemd service..."
ynh_systemd_action --service_name=$app --action="start" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving on"
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX

14
scripts/install
View file

@ -6,7 +6,6 @@
# IMPORT GENERIC HELPERS # IMPORT GENERIC HELPERS
#================================================= #=================================================
source detect_arch
source _common.sh source _common.sh
source ynh_detect_arch__2 source ynh_detect_arch__2
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
@ -58,7 +57,7 @@ final_path=/var/www/$app
test ! -e "$final_path" || ynh_die --message="This path already contains a folder" test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
# Register (book) web path # Register (book) web path
ynh_webpath_register $app $domain $path_url ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
@ -77,7 +76,7 @@ ynh_app_setting_set --app=$app --key=single_user --value=$single_user
#================================================= #=================================================
# FIND AND OPEN A PORT # FIND AND OPEN A PORT
#================================================= #=================================================
ynh_print_info --message="Configuring firewall ..." ynh_print_info --message="Configuring firewall..."
# Find a free port # Find a free port
port=$(ynh_find_port --port=8095) port=$(ynh_find_port --port=8095)
@ -124,7 +123,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD
#================================================= #=================================================
ynh_print_info --message="Configuring a systemd service ..." ynh_print_info --message="Configuring a systemd service..."
# Create a dedicated systemd config # Create a dedicated systemd config
ynh_add_systemd_config ynh_add_systemd_config
@ -176,18 +175,19 @@ chown -R "$app":"$app" "$final_path"
#================================================= #=================================================
# if using yunohost version 3.2 or more in the 'manifest.json', a description can be added # if using yunohost version 3.2 or more in the 'manifest.json', a description can be added
yunohost service add $app --description "$app daemon for WriteFreely" --log_type systemd yunohost service add $app --description "$app daemon for WriteFreely" --log "/var/log/$app/$app.log"
#================================================= #=================================================
# START SYSTEMD SERVICE # START SYSTEMD SERVICE
#================================================= #=================================================
ynh_systemd_action --service_name=$app --action=start # Start a systemd service
ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving on"
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================
ynh_print_info --message="Configuring SSOwat ..." ynh_print_info --message="Configuring SSOwat..."
# Make app public if necessary # Make app public if necessary
if [ $is_public -eq 1 ] if [ $is_public -eq 1 ]

16
scripts/remove
View file

@ -29,7 +29,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
#================================================= #=================================================
# Remove a service from the admin panel, added by `yunohost service add` # Remove a service from the admin panel, added by `yunohost service add`
if yunohost service status $app >/dev/null 2>&1 if ynh_exec_warn_less yunohost service status $app >/dev/null
then then
ynh_print_info --message="Removing $app service..." ynh_print_info --message="Removing $app service..."
yunohost service remove $app yunohost service remove $app
@ -46,7 +46,7 @@ ynh_remove_systemd_config
#================================================= #=================================================
# REMOVE THE MYSQL DATABASE # REMOVE THE MYSQL DATABASE
#================================================= #=================================================
ynh_print_info --message="Removing the MySQL database" ynh_print_info --message="Removing the MySQL database..."
# Remove a database if it exists, along with the associated user # Remove a database if it exists, along with the associated user
ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
@ -54,7 +54,7 @@ ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
#================================================= #=================================================
# REMOVE APP MAIN DIR # REMOVE APP MAIN DIR
#================================================= #=================================================
ynh_print_info --message="Removing app main directory" ynh_print_info --message="Removing app main directory..."
# Remove the app directory securely # Remove the app directory securely
ynh_secure_remove --file="$final_path" ynh_secure_remove --file="$final_path"
@ -62,11 +62,19 @@ ynh_secure_remove --file="$final_path"
#================================================= #=================================================
# REMOVE NGINX CONFIGURATION # REMOVE NGINX CONFIGURATION
#================================================= #=================================================
ynh_print_info --message="Removing nginx web server configuration" ynh_print_info --message="Removing nginx web server configuration..."
# Remove the dedicated nginx config # Remove the dedicated nginx config
ynh_remove_nginx_config ynh_remove_nginx_config
#=================================================
# REMOVE LOGROTATE CONFIGURATION
#=================================================
ynh_script_progression --message="Removing logrotate configuration..." --time --weight=1
# Remove the app-specific logrotate config
ynh_remove_logrotate
#================================================= #=================================================
# CLOSE A PORT # CLOSE A PORT
#================================================= #=================================================

2
scripts/restore
View file

@ -102,7 +102,7 @@ yunohost service add $app --description "$app daemon for WriteFreely" --log_type
#================================================= #=================================================
ynh_print_info --message="Starting a systemd service..." ynh_print_info --message="Starting a systemd service..."
ynh_systemd_action --service_name=$app --action="start" ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving on"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION

11
scripts/upgrade
View file

@ -6,7 +6,6 @@
# IMPORT GENERIC HELPERS # IMPORT GENERIC HELPERS
#================================================= #=================================================
source detect_arch
source _common.sh source _common.sh
source ynh_detect_arch__2 source ynh_detect_arch__2
source ynh_check_app_version_changed source ynh_check_app_version_changed
@ -88,9 +87,9 @@ ynh_print_info --message="Backing up the app before upgrading (may take a while)
# Backup the current version of the app # Backup the current version of the app
ynh_backup_before_upgrade ynh_backup_before_upgrade
ynh_clean_setup () { ynh_clean_setup () {
ynh_clean_check_starting
# restore it if the upgrade fails # restore it if the upgrade fails
ynh_restore_upgradebackup ynh_restore_upgradebackup
ynh_clean_check_starting
} }
# Exit if an error occurs during the execution of the script # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors
@ -100,8 +99,9 @@ ynh_abort_if_errors
#================================================= #=================================================
# STOP SYSTEMD SERVICE # STOP SYSTEMD SERVICE
#================================================= #=================================================
ynh_print_info --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action=stop ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Write Freely"
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
@ -136,6 +136,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
#================================================= #=================================================
# MAKE UPGRADE # MAKE UPGRADE
#================================================= #=================================================
ynh_print_info --message="Making the upgrade..."
chown -R "$app":"$app" "$final_path" chown -R "$app":"$app" "$final_path"
@ -183,9 +184,9 @@ fi
#================================================= #=================================================
# START SERVICE # START SERVICE
#================================================= #=================================================
ynh_print_info --message="Starting a systemd service.." ynh_print_info --message="Starting a systemd service..."
ynh_systemd_action --service_name=$app --action=start ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Serving on"
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX