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.

Sign up for GitHub

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

v18.0 #11

Closed
wants to merge 3 commits into from
Closed

v18.0 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a9ac8c
v18.0
qq7 Oct 6, 2023
ec94f87
cleanup
qq7 Oct 6, 2023
0e7d498
Remove webshell port from Makefile
qq7 Jan 20, 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
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
WEBMIN_FW_TCP_INCOMING = 22 80 443 12320 12321
WEBMIN_FW_TCP_INCOMING = 22 80 443 12321
RBY_VER=2.7.8

include $(FAB_PATH)/common/mk/turnkey/rails.mk
include $(FAB_PATH)/common/mk/turnkey.mk
9 changes: 9 additions & 0 deletions changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
turnkey-foodsoft-18.0 (1) turnkey; urgency=low

* Update Foodsoft to install latest version: 4.8.0

* Note: Please refer to turnkey-core's 18.0 changelog for changes common to all
appliances. Here we only describe changes specific to this appliance.

-- Zhenya Hvorostian <[email protected]> Fri, 10 Oct 2023 16:58:00 +0300

turnkey-foodsoft-16.1 (1) turnkey; urgency=low

* Update Foodsoft to install latest version: 4.7.1
Expand Down
2 changes: 1 addition & 1 deletion conf.d/downloads
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ dlfs() {
}

# download standart foodsoft
dlfs foodcoops/foodsoft v4.7.1 standard
dlfs foodcoops/foodsoft v4.8.0 standard

5 changes: 3 additions & 2 deletions conf.d/main
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ export SECRET_KEY_BASE=$SECRET_KEY

# install dependencies
[ "$FAB_HTTP_PROXY" ] && export HTTP_PROXY=$FAB_HTTP_PROXY
gem install bundler:1.15.4
bundle install --without test development
gem install bundler

bundle install --without test development --deployment
bundle exec rake foodsoft:setup:stock_config RAILS_ENV=production

unset HTTP_PROXY
Expand Down
4 changes: 2 additions & 2 deletions overlay/usr/lib/inithooks/bin/foodsoft.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
import sys
import glob
import getopt
import inithooks_cache
from libinithooks import inithooks_cache
import string
import subprocess

from subprocess import Popen, PIPE

from dialog_wrapper import Dialog
from libinithooks.dialog_wrapper import Dialog

APPS_PATH='/var/www/'
APP_DEFAULT_PATH=os.path.join(APPS_PATH, 'foodsoft')
Expand Down
1 change: 0 additions & 1 deletion plan/main
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ libmagick++-dev
libmagickwand-dev

libsqlite3-dev
libqtwebkit-dev