Skip to content

Commit

Permalink
FIX: Default Configuration file location is /etc/multiflexi/multiflex…
Browse files Browse the repository at this point in the history
…i.env

Do not modify composer.json in git
  • Loading branch information
Vitexus committed May 4, 2024
1 parent f6956e5 commit 5bd88e3
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
12 changes: 6 additions & 6 deletions Vagrantfile
Expand Up @@ -19,13 +19,13 @@ Vagrant.configure("2") do |config|
apt-get install -y apache2 libapache2-mod-php
apt -y install multiflexi-sqlite
#apt -y install multiflexi-sqlite
#apt -y install mariadb-server
#systemctl start mysql
#apt -y install multiflexi-mysql
apt -y install mariadb-server
systemctl start mysql
apt -y install multiflexi-mysql
phinx seed:run -c /usr/lib/multiflexi/phinx-adapter.php
#phinx seed:run -c /usr/lib/multiflexi/phinx-adapter.php
a2enconf multiflexi
echo ServerName MultiFlexi >> /etc/apache2/apache2.conf
Expand All @@ -49,7 +49,7 @@ Vagrant.configure("2") do |config|
apache2ctl restart
apt-get -y install links
links -dump http://localhost/multiflexi
links -dump http://localhost/multiflexi/
SHELL
end
8 changes: 7 additions & 1 deletion debian/changelog
@@ -1,3 +1,9 @@
multiflexi (1.12.1) jammy; urgency=medium

* Config file initialization fix

-- Vítězslav Dvořák <info@vitexsoftware.cz> Sat, 04 May 2024 08:50:26 +0200

multiflexi (1.12.0) jammy; urgency=medium

[ CyberVitexus ]
Expand All @@ -6,7 +12,7 @@ multiflexi (1.12.0) jammy; urgency=medium
[ Vítězslav Dvořák ]
* App topics itroduced

-- Vítězslav Dvořák <info@vitexsoftware.cz> Tue, 23 Apr 2024 21:03:11 +0200
-- Vítězslav Dvořák <info@vitexsoftware.cz> Sat, 04 May 2024 08:46:06 +0200

multiflexi (1.10.5) UNRELEASED; urgency=medium

Expand Down
1 change: 0 additions & 1 deletion debian/conf/composer.json
@@ -1,7 +1,6 @@
{
"name": "vitexsoftware/multiflexi",
"description": "Tool used to setup AbraFlexi multiinstance",
"version": "1.11.0",
"type": "project",
"require": {
"deb/ease-bootstrap4-widgets-abraflexi": "*",
Expand Down
1 change: 0 additions & 1 deletion debian/multiflexi.install
Expand Up @@ -7,7 +7,6 @@ src/assets/Buttons-1.5.6/swf/* usr/share/multiflexi/assets/Buttons-1.
src/images/* usr/share/multiflexi/images
db/migrations/* usr/lib/multiflexi/db/migrations
db/seeds/* usr/lib/multiflexi/db/seeds
debian/conf/composer.json usr/lib/multiflexi
debian/conf/phinx-adapter.php usr/lib/multiflexi
src/MultiFlexi/*.php usr/lib/multiflexi/MultiFlexi/
src/MultiFlexi/Env/*.php usr/lib/multiflexi/MultiFlexi/Env/
Expand Down
4 changes: 2 additions & 2 deletions debian/rules
Expand Up @@ -13,11 +13,11 @@

override_dh_install:
dh_install
jq '.version = "'`dpkg-parsechangelog | sed -n 's/^Version: //p'| sed 's/~.*//'`'"' debian/conf/composer.json |sponge debian/conf/composer.json
jq '.version = "'`dpkg-parsechangelog | sed -n 's/^Version: //p'| sed 's/~.*//'`'"' debian/conf/composer.json |sponge debian/usr/lib/multiflexi/composer.json
sed -i -e 's/.\.\/vendor/\/var\/lib\/composer\/multiflexi/g' debian/multiflexi/usr/share/multiflexi/init.php
sed -i -e 's/.\.\/vendor/\/var\/lib\/composer\/multiflexi/g' debian/multiflexi*/usr/lib/multiflexi/*.php
sed -i -e 's/\.\.\/\.env/\/etc\/multiflexi\/\multiflexi\.env/g' debian/multiflex*/usr/lib/multiflexi/*.php
sed -i -e 's/dirname(__DIR__)/"\/etc\/multiflexi"/' debian/multiflexi/usr/share/multiflexi/init.php
sed -i -e '/dirname(__DIR__)/c\ "\/etc\/multiflexi\/multiflexi\.env"' debian/multiflexi/usr/share/multiflexi/init.php
sed -i -e 's/\.\.\/\.env/\/etc\/multiflexi\/\.env/g' debian/multiflexi/usr/lib/multiflexi/phinx-adapter.php
sed -i -e 's/composer\.json/\/usr\/lib\/multiflexi\/composer\.json/g' debian/multiflexi/usr/lib/multiflexi/MultiFlexi/Ui/PageBottom.php
sed -i -e 's/js\/jquery.dataTables.js/\/javascript\/jquery-datatables\/jquery.dataTables.js/g' debian/multiflexi/usr/lib/multiflexi/MultiFlexi/Ui/DBDataTable.php
Expand Down

0 comments on commit 5bd88e3

Please sign in to comment.