Merge branch 'nf-graphs-decix' into v4

.env.example

@@ -2,32 +2,41 @@
 #
 # IXP Manager V4+ configuration.
 #
-# Local / environment specific settings.
 #
 #
 
-
-APP_ENV=local
-APP_DEBUG=true
-APP_KEY=xxxx
+APP_ENV=production
+APP_DEBUG=false
+APP_KEY="XXX set a random 32char alphanumeric key!XXX"
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_DATABASE=ixp
 DB_USERNAME=ixp
 DB_PASSWORD=ixp
 
+IXP_MULTIIXP_ENABLED=false
+IXP_RESELLER_ENABLED=false
+IXP_AS112_UI_ACTIVE=false
+
 CACHE_DRIVER=array
 SESSION_DRIVER=file
 
-# See: http://ixp-manager.readthedocs.org/en/latest/features/helpdesk-integration.html
-HELPDESK_BACKEND=none
-# HELPDESK_BACKEND=zendesk
-HELPDESK_ZENDESK_SUBDOMAIN=ixp
-HELPDESK_ZENDESK_TOKEN=yyy
-HELPDESK_ZENDESK_EMAIL=[email protected]
-
-
 DOCTRINE_PROXY_AUTOGENERATE=false
 DOCTRINE_CACHE=array
 DOCTRINE_CACHE_NAMESPACE=IXPMANAGERNAMESPACE
+
+
+#######################################################################################
+### Graphing - see https://ixp-manager.readthedocs.org/en/latest/features/grapher.html
+GRAPHER_BACKENDS="dummy"
+
+#GRAPHER_BACKEND_MRTG_WORKDIR="/tmp"
+#GRAPHER_BACKEND_MRTG_LOGDIR="http://stats.example.com/mrtg"
+#GRAPHER_BACKEND_SFLOW_ROOT="http://sflow.example.com/sflow"
+#GRAPHER_CACHE_ENABLED=true
+
+
+#######################################################################################
+### Skinning: see https://ixp-manager.readthedocs.org/en/latest/features/skinning.html
+# VIEW_SKIN="myskin"

.gitignore

@@ -41,6 +41,7 @@ application/configs/ci-*
 *.DS_Store
 
 config/identity.php
+config/grapher_trunks.php
 
 application/configs/rs*.conf
 

Vagrantfile

@@ -12,7 +12,7 @@ Vagrant.configure(2) do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "ubuntu/wily64"
+  config.vm.box = "ubuntu/xenial64"
 
   # in case you want to use VMware Fusion instead of Virtualbox we need a
   # slightly different base box
@@ -45,18 +45,21 @@ Vagrant.configure(2) do |config|
   # argument is a set of non-required options.
   # config.vm.synced_folder "../data", "/vagrant_data"
 
+  config.vm.synced_folder ".", "/vagrant/", id: "vagrant-root0",
+    owner: "ubuntu"
+
   config.vm.synced_folder "./storage", "/vagrant/storage", id: "vagrant-root1",
-      owner: "vagrant",
+      owner: "ubuntu",
       group: "www-data",
       mount_options: ["dmode=775,fmode=664"]
 
   config.vm.synced_folder "./var", "/vagrant/var", id: "vagrant-root2",
-      owner: "vagrant",
+      owner: "ubuntu",
       group: "www-data",
       mount_options: ["dmode=775,fmode=664"]
 
   config.vm.synced_folder "./database/Proxies", "/vagrant/database/Proxies", id: "vagrant-root3",
-      owner: "vagrant",
+      owner: "ubuntu",
       group: "www-data",
       mount_options: ["dmode=775,fmode=664"]
 
@@ -69,8 +72,11 @@ Vagrant.configure(2) do |config|
   #   # Display the VirtualBox GUI when booting the machine
   #   vb.gui = true
   #
-     # Customize the amount of memory on the VM:
-     vb.memory = "1536"
+    # Customize the amount of memory on the VM:
+    vb.memory = "1536"
+
+    # video memory
+    #v.customize ["modifyvm", :id, "--vram", "32"]
   end
   #
   # View the documentation for the provider you are using for more

app/Console/Commands/Command.php

@@ -1,9 +1,36 @@
 <?php namespace IXP\Console\Commands;
 
 use Symfony\Component\Console\Output\OutputInterface;
+use IXP\Traits\Common;
+use Entities\IXP;
 
 class Command extends \Illuminate\Console\Command {
 
+    use Common;
+
+    /**
+     * Get whatever IXP was specified on the command line
+     *
+     * We have not implemented multi-IXP in v4 but we're leaving the framework in
+     * place as it's well constructed to allow for it.
+     *
+     * @param int id A specfic IXP id to load (otherwise command line option or default)
+     * @return Entities\IXP
+     */
+    protected function ixp( $id = null ): IXP {
+        // what IXP are we running on here?
+        if( $this->multiIXP() ) {
+            $this->error( 'Multi IXP support has not been ported to V4 due to no usage.' );
+            exit -1;
+
+            //$ixpid = $this->getParam( 'ixp', false );
+            //if( !$ixpid || !( $ixp = $this->getD2R( '\\Entities\\IXP' )->find( $ixpid ) ) )
+            //    die( "ERROR: Invalid or no IXP specified.\n" );
+        } else {
+            return d2r( 'IXP' )->getDefault();
+        }
+    }
+
     // /**
     //  * Returns true if verbosity is at least: VERBOSITY_QUIET
     //  * @return bool