Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing - v6 #126

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
44d1fbe
Bump version, add email config, remove supervisor code - from eric_g
Salamandar Mar 14, 2024
af0f897
remove fetch settings at build
Gredin67 Feb 27, 2024
118d200
ruby 3.2.2 nodejs 18.15
Gredin67 Feb 26, 2024
84b93ee
ffi and yaml deps
Gredin67 Mar 27, 2024
a3ce6c0
bundler_version locked_settings
Gredin67 Mar 27, 2024
11f6f70
locked_settings
Gredin67 Mar 28, 2024
23d7f79
Update manifest.toml
ericgaspar May 13, 2024
cc3a465
Update _common.sh
ericgaspar May 13, 2024
a3106ff
reorg _common.sh
Salamandar Jun 28, 2024
32af6e6
build ruby with ynh_exec_as
Salamandar Jun 28, 2024
cf66e1a
use rails instead of rake
Salamandar Jun 28, 2024
725a95a
Install latest bundler
Salamandar Jun 28, 2024
5eb88f1
More straightforward bindle install
Salamandar Jun 28, 2024
3a12968
Move from secrets.yml to .env
Salamandar Jun 28, 2024
b335cd5
bundler needs to be installed as root
Salamandar Jun 28, 2024
ff8e852
Fix env to call ruby
Salamandar Jun 28, 2024
8ad2862
Try to fix bundle install
Salamandar Jun 29, 2024
6c50a3c
fix call to gem
Salamandar Jun 29, 2024
bca4da2
try to fix v6
Salamandar Jun 29, 2024
1c24a68
Found out what's wrong, fixed
Salamandar Jun 29, 2024
21b49cc
Actually need to source inside sudo
Salamandar Jun 30, 2024
0aada4d
Fix db creation: don't call migration but schema load and seed
Salamandar Jun 30, 2024
6aadeb4
Fix db install
Salamandar Jun 30, 2024
8e26c33
Check for password policy at the beginning of the app install
Salamandar Jun 30, 2024
62258cf
Fix services config : add environentfile
Salamandar Jun 30, 2024
f58e71b
Fix service puma call
Salamandar Jun 30, 2024
1e1ba65
Fix service puma call
Salamandar Jun 30, 2024
940052c
Upgrade to v6.3.27
yunohost-bot Jun 13, 2024
9062307
Cleanup
Salamandar Jun 30, 2024
11d1452
Fix restore, upgrade
Salamandar Jun 30, 2024
30b0e16
Auto-update READMEs
yunohost-bot Jul 1, 2024
f7a8359
Update list of things to keep
Salamandar Jul 1, 2024
1759e5e
Upgrade to v6.3.28
yunohost-bot Jul 6, 2024
5667593
Auto-update READMEs
yunohost-bot Jul 6, 2024
5b53020
Merge pull request #127 from YunoHost-Apps/ci-auto-update-6.3.28
ericgaspar Jul 6, 2024
05ca830
Upgrade sources
yunohost-bot Jul 20, 2024
79c9060
Auto-update READMEs
yunohost-bot Jul 20, 2024
cfe8e01
Merge pull request #128 from YunoHost-Apps/ci-auto-update-6.3.30
ericgaspar Jul 20, 2024
ff72dcb
Upgrade sources
yunohost-bot Jul 23, 2024
ab2ba22
Auto-update READMEs
yunohost-bot Jul 23, 2024
dc78803
cleaning
ericgaspar Aug 23, 2024
25913eb
Auto-update READMEs
yunohost-bot Aug 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ALL_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@
- [Irakurri README euskaraz](README_eu.md)
- [Lire le README en français](README_fr.md)
- [Le o README en galego](README_gl.md)
- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
- [Прочитать README на русский](README_ru.md)
- [阅读中文(简体)的 README](README_zh_Hans.md)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ It shall NOT be edited by hand.
Fab-manager is the Fab Lab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks, and document your marker's projects.


**Shipped version:** 5.6.5~ynh2
**Shipped version:** 6.3.31~ynh1

**Demo:** <https://www.fab-manager.com/fr/demo>

Expand Down
2 changes: 1 addition & 1 deletion README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ No se debe editar a mano.
Fab-manager is the Fab Lab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks, and document your marker's projects.


**Versión actual:** 5.6.5~ynh2
**Versión actual:** 6.3.31~ynh1

**Demo:** <https://www.fab-manager.com/fr/demo>

Expand Down
2 changes: 1 addition & 1 deletion README_eu.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ EZ editatu eskuz.
Fab-manager is the Fab Lab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks, and document your marker's projects.


**Paketatutako bertsioa:** 5.6.5~ynh2
**Paketatutako bertsioa:** 6.3.31~ynh1

**Demoa:** <https://www.fab-manager.com/fr/demo>

Expand Down
2 changes: 1 addition & 1 deletion README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
Fab-manager is the Fab Lab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks, and document your marker's projects.


**Version incluse :** 5.6.5~ynh2
**Version incluse :** 6.3.31~ynh1

**Démo :** <https://www.fab-manager.com/fr/demo>

Expand Down
2 changes: 1 addition & 1 deletion README_gl.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ NON debe editarse manualmente.
Fab-manager is the Fab Lab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks, and document your marker's projects.


**Versión proporcionada:** 5.6.5~ynh2
**Versión proporcionada:** 6.3.31~ynh1

**Demo:** <https://www.fab-manager.com/fr/demo>

Expand Down
50 changes: 50 additions & 0 deletions README_id.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!--
N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
Ini TIDAK boleh diedit dengan tangan.
-->

# Fab-manager untuk YunoHost

[![Tingkat integrasi](https://dash.yunohost.org/integration/fab-manager.svg)](https://ci-apps.yunohost.org/ci/apps/fab-manager/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/fab-manager.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/fab-manager.maintain.svg)

[![Pasang Fab-manager dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fab-manager)

*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*

> *Paket ini memperbolehkan Anda untuk memasang Fab-manager secara cepat dan mudah pada server YunoHost.*
> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*

## Ringkasan

Fab-manager is the Fab Lab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks, and document your marker's projects.


**Versi terkirim:** 6.3.31~ynh1

**Demo:** <https://www.fab-manager.com/fr/demo>

## Tangkapan Layar

![Tangkapan Layar pada Fab-manager](./doc/screenshots/dashboard-mockup.webp)

## Dokumentasi dan sumber daya

- Website aplikasi resmi: <https://www.fab-manager.com>
- Dokumentasi admin resmi: <http://doc.fab.mn>
- Depot kode aplikasi hulu: <https://github.com/sleede/fab-manager>
- Gudang YunoHost: <https://apps.yunohost.org/app/fab-manager>
- Laporkan bug: <https://github.com/YunoHost-Apps/fab-manager_ynh/issues>

## Info developer

Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/fab-manager_ynh/tree/testing).

Untuk mencoba branch `testing`, silakan dilanjutkan seperti:

```bash
sudo yunohost app install https://github.com/YunoHost-Apps/fab-manager_ynh/tree/testing --debug
atau
sudo yunohost app upgrade fab-manager -u https://github.com/YunoHost-Apps/fab-manager_ynh/tree/testing --debug
```

**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
50 changes: 50 additions & 0 deletions README_ru.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!--
Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
Он НЕ ДОЛЖЕН редактироваться вручную.
-->

# Fab-manager для YunoHost

[![Уровень интеграции](https://dash.yunohost.org/integration/fab-manager.svg)](https://ci-apps.yunohost.org/ci/apps/fab-manager/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/fab-manager.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/fab-manager.maintain.svg)

[![Установите Fab-manager с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fab-manager)

*[Прочтите этот README на других языках.](./ALL_README.md)*

> *Этот пакет позволяет Вам установить Fab-manager быстро и просто на YunoHost-сервер.*
> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*

## Обзор

Fab-manager is the Fab Lab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks, and document your marker's projects.


**Поставляемая версия:** 6.3.31~ynh1

**Демо-версия:** <https://www.fab-manager.com/fr/demo>

## Снимки экрана

![Снимок экрана Fab-manager](./doc/screenshots/dashboard-mockup.webp)

## Документация и ресурсы

- Официальный веб-сайт приложения: <https://www.fab-manager.com>
- Официальная документация администратора: <http://doc.fab.mn>
- Репозиторий кода главной ветки приложения: <https://github.com/sleede/fab-manager>
- Магазин YunoHost: <https://apps.yunohost.org/app/fab-manager>
- Сообщите об ошибке: <https://github.com/YunoHost-Apps/fab-manager_ynh/issues>

## Информация для разработчиков

Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/fab-manager_ynh/tree/testing).

Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:

```bash
sudo yunohost app install https://github.com/YunoHost-Apps/fab-manager_ynh/tree/testing --debug
или
sudo yunohost app upgrade fab-manager -u https://github.com/YunoHost-Apps/fab-manager_ynh/tree/testing --debug
```

**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>
2 changes: 1 addition & 1 deletion README_zh_Hans.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
Fab-manager is the Fab Lab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks, and document your marker's projects.


**分发版本:** 5.6.5~ynh2
**分发版本:** 6.3.31~ynh1

**演示:** <https://www.fab-manager.com/fr/demo>

Expand Down
77 changes: 77 additions & 0 deletions conf/dot_env
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Add application configuration variables here, as shown below.
# This file is read by dotenv

# Databases
POSTGRES_HOST=localhost
POSTGRES_PASSWORD=__DB_PWD__
REDIS_HOST=localhost
ELASTICSEARCH_HOST=localhost

SECRET_KEY_BASE=__SECRET_KEY_BASE__

# Stripe keys for tests
STRIPE_API_KEY=
STRIPE_PUBLISHABLE_KEY=

# oAuth SSO keys for tests
OAUTH_CLIENT_ID=github-oauth-app-id
OAUTH_CLIENT_SECRET=github-oauth-app-secret
OIDC_CLIENT_ID=oidc-client-id
OIDC_CLIENT_SECRET=oidc-client-secret

# Configure carefully!
DEFAULT_HOST=__DOMAIN__
DEFAULT_PROTOCOL=https

# Email config
DELIVERY_METHOD=smtp
SMTP_ADDRESS=localhost
SMTP_PORT=25
SMTP_DOMAIN=__DOMAIN__
SMTP_USER_NAME=__APP__
SMTP_PASSWORD=__MAIL_PWD__
SMTP_AUTHENTICATION=plain
SMTP_ENABLE_STARTTLS_AUTO=false
SMTP_OPENSSL_VERIFY_MODE=none
SMTP_TLS=false

# I18N configuration
RAILS_LOCALE=fr
APP_LOCALE=fr
MOMENT_LOCALE=fr
SUMMERNOTE_LOCALE=fr-FR
ANGULAR_LOCALE=fr-fr
FULLCALENDAR_LOCALE=fr
INTL_LOCALE=fr-FR
INTL_CURRENCY=EUR
FORCE_VERSION_CHECK=false
ALLOW_INSECURE_HTTP=false

POSTGRESQL_LANGUAGE_ANALYZER=french

TIME_ZONE=Paris
WEEK_STARTING_DAY=monday
D3_DATE_FORMAT=%d/%m/%y
UIB_DATE_FORMAT=dd/MM/yyyy
EXCEL_DATE_FORMAT=dd/mm/yyyy

# OpenLab Projects
# do not change this URL
OPENLAB_BASE_URI=https://openprojects.fab-manager.com
OPENLAB_SSL_VERIFY=true

# System settings
LOG_LEVEL=debug
RAILS_LOG_TO_STDOUT=true
DISK_SPACE_MB_ALERT=1024
ADMINSYS_EMAIL=__ADMIN_MAIL__
ENABLE_SENTRY=false

# 5242880 = 5 megabytes
MAX_IMPORT_SIZE=5242880
# 10485760 = 10 megabytes
MAX_IMAGE_SIZE=10485760
# 20971520 = 20 megabytes
MAX_CAO_SIZE=20971520
# 5242880 = 5 megabytes
MAX_SUPPORTING_DOCUMENT_FILE_SIZE=5242880
4 changes: 3 additions & 1 deletion conf/fab-manager-app.service
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ User=__APP__
WorkingDirectory=__INSTALL_DIR__
Environment="__LD_PRELOAD__"
Environment="__YNH_RUBY_LOAD_PATH__"
EnvironmentFile=__INSTALL_DIR__/.env
Environment="RAILS_ENV=production"

ExecStartPre=-rm -f __INSTALL_DIR__/tmp/pids/server.pid
ExecStart=__INSTALL_DIR__/bin/bundle exec rails s puma -p __PORT__ -b 127.0.0.1
ExecStart=__INSTALL_DIR__/bin/bundle exec rails server -u puma -p __PORT__ -b 127.0.0.1
ExecReload=/bin/kill -SIGUSR1 $MAINPID
TimeoutSec=15
Restart=always
Expand Down
2 changes: 2 additions & 0 deletions conf/fab-manager-worker.service
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ User=__APP__
WorkingDirectory=__INSTALL_DIR__
Environment="__LD_PRELOAD__"
Environment="__YNH_RUBY_LOAD_PATH__"
EnvironmentFile=__INSTALL_DIR__/.env
Environment="RAILS_ENV=production"

ExecStart=__INSTALL_DIR__/bin/bundle exec sidekiq -C __INSTALL_DIR__/config/sidekiq.yml
TimeoutSec=15
Restart=always
Expand Down
1 change: 0 additions & 1 deletion conf/secrets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,3 @@ production:
disk_space_mb_alert: 1024
adminsys_email: '__ADMIN_MAIL__'
allow_insecure_http: false
locked_settings: <%= ENV.fetch("LOCKED_SETTINGS", 'uuid,origin').split(/,/) %>
12 changes: 8 additions & 4 deletions manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "Fab-manager"
description.en = "Fab Lab management solution"
description.fr = "Solution de gestion de Fab Lab"

version = "5.6.5~ynh2"
version = "6.3.31~ynh1"

maintainers = []

Expand All @@ -19,11 +19,13 @@ admindoc = "http://doc.fab.mn"
code = "https://github.com/sleede/fab-manager"

[integration]
yunohost = ">= 11.2.12"
yunohost = ">= 11.2.27"
architectures = "all"
multi_instance = false

ldap = false
sso = false

disk = "50M"
ram.build = "50M"
ram.runtime = "50M"
Expand All @@ -46,8 +48,8 @@ ram.runtime = "50M"

[resources]
[resources.sources.main]
url = "https://api.github.com/repos/sleede/fab-manager/tarball/v5.6.5"
sha256 = "dc6ae9fefd893975ee2b70c5b327a37b3d585dcf223ddffe75cc0b570771102d"
url = "https://github.com/sleede/fab-manager/archive/refs/tags/v6.3.31.tar.gz"
sha256 = "c6e51032b5b51f94ff1c48b263f791c86c83722aa5b000c39aadb55896b975b1"

autoupdate.strategy = "latest_github_tag"

Expand Down Expand Up @@ -83,6 +85,8 @@ ram.runtime = "50M"
# For Ruby

"libjemalloc-dev",
"libffi-dev",
"libyaml-dev",
"curl",
"build-essential",
"libreadline-dev",
Expand Down
Loading