Skip to content

Commit

Permalink
Merge branch 'rs-pairing'
Browse files Browse the repository at this point in the history
  • Loading branch information
barryo committed May 24, 2024
2 parents e6bfd25 + e1b5a46 commit 0cc4c09
Show file tree
Hide file tree
Showing 160 changed files with 51,669 additions and 11,654 deletions.
11 changes: 8 additions & 3 deletions .env.ci
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,22 @@
APP_KEY="base64:8QNjg1qPkdRSRntnjpKbfBpfUtENOu40WQtxHJWdTXs="
APP_URL="http://127.0.0.1:8000"

APP_ENV="development"
APP_ENV="testing"
APP_DEBUG=true
APP_TIMEZONE="Europe/Dublin"
APP_LOG="single"

DEBUGBAR_ENABLED=false
TELESCOPE_ENABLED=false

IXP_PHPUNIT_RUNNING=true

DB_HOST=127.0.0.1
DB_DATABASE=myapp_test
DB_USERNAME=root
DB_PASSWORD=


#######################################################################################
### Graphing - see https://ixp-manager.readthedocs.org/en/latest/features/grapher.html
### Needed for the MRTG config generation test.
Expand All @@ -30,9 +34,10 @@ CACHE_DRIVER=null

IXP_API_JSONEXPORTSCHEMA_PUBLIC=true

MAIL_MAILER=log
MAIL_MAILER=array

QUEUE_CONNECTION=sync

IXP_FE_BETA_CORE_BUNDLES=true


# IP address and port of the first RPKI local cache:
Expand Down
4 changes: 3 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ DB_PASSWORD="password"

# Used in various emails, etc.
IDENTITY_SITENAME="Vagrant IXP Manager"

APP_NAME="${IDENTITY_SITENAME}"
# Shown in title bar of web portal. Defaults to IDENTITY_SITENAME
# IDENTITY_TITLENAME="Vagrant IXP Manager"

Expand Down Expand Up @@ -143,6 +143,8 @@ IXP_FE_FRONTEND_DISABLED_LOGO=false
# Disable links to the peering matrix if you have not set it up (with sflow):
# IXP_FE_FRONTEND_DISABLED_PEERING_MATRIX=true

# Enable route server filtering by uncommenting this line:
IXP_FE_FRONTEND_DISABLED_RS_FILTERS=false

#######################################################################################
### Graphing - see https://docs.ixpmanager.org/grapher/introduction
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-dusk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Install Dependencies
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
- name: Set up Dusk chrome-drover
run: php artisan dusk:update 118
run: php artisan dusk:update 124
- name: Directory Permissions
run: chmod -R 777 storage bootstrap/cache
- name: Create Database
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
.buildpath
.settings/
.vagrant/

auth.json
/.fleet
/vendor/
bin/fixtures.php
public/.htaccess
public/logos/*
/public/build

public/favicon.ico

Expand Down
32 changes: 20 additions & 12 deletions .idea/IXP-Manager.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions .idea/blade.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/codeception.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/dictionaries/barryo.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/laravel-idea-personal.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/laravel-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 29 additions & 11 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/phpspec.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0cc4c09

Please sign in to comment.