diff --git a/README.md b/README.md index 65762ce..f92bcf3 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Federated blogging engine, based on ActivityPub. It uses the Rocket framework, and Diesel to interact with the database. -**Shipped version:** 0.3.0-alpha-2 +**Shipped version:** 0.4.0-alpha-4 **Warning:** The package can take **15 to 30 minutes** to complete depending on your system configuration. **Don't intrupt the installation process while installing.** diff --git a/conf/.env b/conf/.env index 9574cd9..ffb27a1 100755 --- a/conf/.env +++ b/conf/.env @@ -1,25 +1,47 @@ -# The address of the database -# (replace USER, PASSWORD, PORT and DATABASE_NAME with your values) -# -# If you are using SQlite, use the path of the database file (`plume.db` for instance) -DATABASE_URL=postgres://__DB_NAME__:__DB_PWD__@localhost:5432/__DB_NAME__ +# This file contains your instance configuration +# Some documentation about these variables is available here: +# https://docs.joinplu.me/environment/ -# For PostgreSQL: migrations/postgres +## GENERAL SETTINGS ## + +# The directory containing database migrations +# For Postgres: migrations/postgres # For SQlite: migrations/sqlite MIGRATION_DIRECTORY=migrations/postgres -# The domain on which your instance will be available +# The URL of your database (or its path for SQlite databases) +DATABASE_URL=postgres://__DB_NAME__:__DB_PWD__@localhost:5432/__DB_NAME__ + +# The domain of your instance BASE_URL=__DOMAIN__ -ROCKET_PORT=__PORT__ -ROCKET_ADDRESS=127.0.0.1 - -# Secret key used for private cookies and CSRF protection +# The secret key for private cookies and CSRF protection # You can generate one with `openssl rand -base64 32` ROCKET_SECRET_KEY=__SECRET_KEY__ -# Mail settings +# Port and address which Plume will use +ROCKET_PORT=__PORT__ +ROCKET_ADDRESS=127.0.0.1 + +## MAIL CONFIG ## MAIL_SERVER=localhost +MAIL_ADDRESS=no-reply@__DOMAIN__ #MAIL_USER=example #MAIL_PASSWORD=123456 -MAIL_HELO_NAME=__DOMAIN__ \ No newline at end of file +MAIL_HELO_NAME=no-reply@__DOMAIN__ + +## ADVANCED OPTIONS ## +#MEDIA_UPLOAD_DIRECTORY=static/media +#SEARCH_INDEX=search_index + +# Sample logo configuration +#PLUME_LOGO=icons/trwnh/paragraphs/plumeParagraphs.svg +#PLUME_LOGO_FAVICON=icons/trwnh/paragraphs/plumeParagraphs32.png +#PLUME_LOGO_48=icons/trwnh/paragraphs/plumeParagraphs48.png +#PLUME_LOGO_72=icons/trwnh/paragraphs/plumeParagraphs72.png +#PLUME_LOGO_96=icons/trwnh/paragraphs/plumeParagraphs96.png +#PLUME_LOGO_144=icons/trwnh/paragraphs/plumeParagraphs144.png +#PLUME_LOGO_160=icons/trwnh/paragraphs/plumeParagraphs160.png +#PLUME_LOGO_192=icons/trwnh/paragraphs/plumeParagraphs192.png +#PLUME_LOGO_256=icons/trwnh/paragraphs/plumeParagraphs256.png +#PLUME_LOGO_512=icons/trwnh/paragraphs/plumeParagraphs512.png diff --git a/conf/Cargo.toml b/conf/Cargo.toml deleted file mode 100644 index 0926cbc..0000000 --- a/conf/Cargo.toml +++ /dev/null @@ -1,81 +0,0 @@ -[package] -authors = ["Plume contributors"] -name = "plume" -version = "0.3.0" -repository = "https://github.com/Plume-org/Plume" - -[dependencies] -activitypub = "0.1.3" -askama_escape = "0.1" -atom_syndication = "0.6" -canapi = "0.2" -colored = "1.7" -dotenv = "0.13" -gettext = { git = "https://github.com/Plume-org/gettext/", rev = "294c54d74c699fbc66502b480a37cc66c1daa7f3" } -gettext-macros = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" } -gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" } -guid-create = "0.1" -heck = "0.3.0" -lettre = { git = "https://github.com/lettre/lettre", rev = "c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49" } -lettre_email = { git = "https://github.com/lettre/lettre", rev = "c988b1760ad8179d9e7f3fb8594d2b86cf2a0a49" } -num_cpus = "1.0" -rocket = "0.4.0" -rocket_contrib = { version = "0.4.0", features = ["json"] } -rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" } -rpassword = "2.0" -runtime-fmt = "0.3.0" -scheduled-thread-pool = "0.2.0" -serde = "1.0" -serde_json = "1.0" -serde_qs = "0.4" -validator = "0.8" -validator_derive = "0.8" -webfinger = "0.3.1" - -[[bin]] -name = "plume" -path = "src/main.rs" - -[dependencies.chrono] -features = ["serde"] -version = "0.4" - -[dependencies.ctrlc] -features = ["termination"] -version = "3.1.1" - -[dependencies.diesel] -features = ["r2d2", "chrono"] -version = "*" - -[dependencies.multipart] -default-features = false -features = ["server"] -version = "0.16" - -[dependencies.plume-api] -path = "plume-api" - -[dependencies.plume-common] -path = "plume-common" - -[dependencies.plume-models] -path = "plume-models" - -[dependencies.rocket_csrf] -git = "https://github.com/fdb-hiroshima/rocket_csrf" -rev = "4a72ea2ec716cb0b26188fb00bccf2ef7d1e031c" - -[build-dependencies] -ructe = "0.5.6" -rsass = "0.9" - -[features] -default = ["postgres"] -postgres = ["plume-models/postgres", "diesel/postgres"] -sqlite = ["plume-models/sqlite", "diesel/sqlite"] -debug-mailer = [] -test = [] - -[workspace] -members = ["plume-api", "plume-cli", "plume-models", "plume-common", "plume-front"] diff --git a/conf/x86-64.src b/conf/x86-64.src index b38afa3..f399288 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Plume-org/Plume/releases/download/0.3.0-alpha-2/plume-postgres.tar.gz -SOURCE_SUM=e0c33a38367a5428606ae7bf8524c325edea09fdb4511c80a7aa8f4eb8f30905 +SOURCE_URL=https://github.com/Plume-org/Plume/releases/download/0.4.0-alpha-4/plume-postgres.tar.gz +SOURCE_SUM=4cb02ae873cf11e04999bf2e2295ff96ea27fe18fdc395c6cce5c8f7cd05ccee SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index f0073ab..2c41dab 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Federated blogging application", "fr": "Une application de blogging fédérée." }, - "version": "0.3.0-alpha-2~ynh1", + "version": "0.4.0-alpha-4~ynh1", "url": "https://baptiste.gelez.xyz/", "license": "AGPL-3.0-only", "maintainer": [ diff --git a/scripts/install b/scripts/install index 59cfb79..86b9744 100755 --- a/scripts/install +++ b/scripts/install @@ -164,9 +164,6 @@ ynh_replace_string --match_string="__SECRET_KEY__" --replace_string="$secret_key # MAKE SETUP #================================================= -# Fix missing Cargo.toml -cp "../conf/Cargo.toml" "$final_path/$app/Cargo.toml" - # Set right permissions chown -R "$app":"$app" $final_path