Merge branch 'new_files_placement' - Resolved rename/delete conflicts

api/bin/phpunit

@@ -1,23 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (!ini_get('date.timezone')) {
-    ini_set('date.timezone', 'UTC');
-}
-
-if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
-    if (PHP_VERSION_ID >= 80000) {
-        require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
-    } else {
-        define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
-        require PHPUNIT_COMPOSER_INSTALL;
-        PHPUnit\TextUI\Command::main();
-    }
-} else {
-    if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
-        echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
-        exit(1);
-    }
-
-    require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
-}

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: vagrant <vagrant@build>
 Rules-Requires-Root: no
 Build-Depends:
- debhelper-compat (= 13),
+ debhelper-compat (= 13)
 Standards-Version: 4.6.2
 Homepage: <insert the upstream URL, if relevant>
 #Vcs-Browser: https://salsa.debian.org/debian/ogdhcp
@@ -13,6 +13,7 @@ Homepage: <insert the upstream URL, if relevant>
 Package: ogdhcp
 Architecture: any
 Multi-Arch: foreign
+Recommends:  kea-dhcp4-server, kea-common, kea-ctrl-agent
 Depends: ${shlibs:Depends}, ${misc:Depends},  debconf (>= 1.5.0),
  php, 
  php-cli, 
@@ -29,9 +30,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends},  debconf (>= 1.5.0),
  php-bcmath, 
  composer, 
  unzip, 
- kea-dhcp4-server, 
- kea-common, 
- kea-ctrl-agent, 
  jq, 
  net-tools, 
  nginx

debian/ogdhcp.dirs

@@ -1,11 +1,16 @@
-/opt/opengnsys/ogdhcp
+/opt/opengnsys/ogdhcp/api
-/opt/opengnsys/ogdhcp/bin
+/opt/opengnsys/ogdhcp/api/bin
-/opt/opengnsys/ogdhcp/config
+/opt/opengnsys/ogdhcp/api/config
-/opt/opengnsys/ogdhcp/docs
+/opt/opengnsys/ogdhcp/api/public
-/opt/opengnsys/ogdhcp/public
+/opt/opengnsys/ogdhcp/api/src
-/opt/opengnsys/ogdhcp/src
+/opt/opengnsys/ogdhcp/api/templates
+/opt/opengnsys/ogdhcp/api/var/
+/opt/opengnsys/ogdhcp/api/var/cache
+/opt/opengnsys/ogdhcp/api/var/log
+/opt/opengnsys/ogdhcp/api/vendor
+/opt/opengnsys/ogdhcp/etc 
 /opt/opengnsys/ogdhcp/etc/kea/backup
-/opt/opengnsys/ogdhcp/templates
+/opt/opengnsys/ogdhcp/docs 
-/opt/opengnsys/ogdhcp/var/cache
+
-/opt/opengnsys/ogdhcp/var/log
+
-/opt/opengnsys/ogdhcp/vendor
+

debian/ogdhcp.install

@@ -1,15 +1,4 @@
-config  /opt/opengnsys/ogdhcp/
+api /opt/opengnsys/ogdhcp/
-public  /opt/opengnsys/ogdhcp/
-src     /opt/opengnsys/ogdhcp/
 etc     /opt/opengnsys/ogdhcp/
-templates /opt/opengnsys/ogdhcp/
-migrations /opt/opengnsys/ogdhcp/
-translations    /opt/opengnsys/ogdhcp/ 
 docs    /opt/opengnsys/ogdhcp/
-var     /opt/opengnsys/ogdhcp/
-vendor /opt/opengnsys/ogdhcp/
-composer.json   /opt/opengnsys/ogdhcp/
-composer.lock   /opt/opengnsys/ogdhcp/
-symfony.lock    /opt/opengnsys/ogdhcp/
-.env.local.php /opt/opengnsys/ogdhcp/
 etc/systemd/system/kea-ctrl-agent.service.d/override.conf /etc/systemd/system/kea-ctrl-agent.service.d/

debian/rules

@@ -19,17 +19,11 @@
 	dh $@
 
 override_dh_auto_build:
-	export COMPOSER_ALLOW_SUPERUSER=1
+	cd api; \
-	export APP_ENV=prod
+	rm -rf var/cache/*; \
-	dh_auto_build
+	mkdir -p bin/; \
-	rm -rf var/cache/*
+	COMPOSER_ALLOW_SUPERUSER=1 APP_ENV=prod composer require symfony/flex --no-interaction; \
-	composer install
+	COMPOSER_ALLOW_SUPERUSER=1 APP_ENV=prod composer update --no-interaction; \
-	composer dump-env prod
+	COMPOSER_ALLOW_SUPERUSER=1 APP_ENV=prod composer install --no-interaction; \
-	composer update doctrine/dbal
+	COMPOSER_ALLOW_SUPERUSER=1 APP_ENV=prod composer dump-env prod --no-interaction; \
-
+	COMPOSER_ALLOW_SUPERUSER=1 APP_ENV=prod composer update doctrine/dbal --no-interaction; \
-
-# dh_make generated override targets.
-# This is an example for Cmake (see <https://bugs.debian.org/641051>).
-#override_dh_auto_configure:
-#	dh_auto_configure -- \
-#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)