Skip to content

Commit

Permalink
Merge pull request #1012 from it-novum/development
Browse files Browse the repository at this point in the history
openITCOCKPIT Version 4
  • Loading branch information
jabdr authored Jul 14, 2020
2 parents 067a669 + c3eac9c commit a47682f
Show file tree
Hide file tree
Showing 10,289 changed files with 442,827 additions and 1,830,979 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
23 changes: 23 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
; This file is for unifying the coding style for different editors and IDEs.
; More information at http://editorconfig.org

root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.bat]
end_of_line = crlf

[*.yml]
indent_size = 2

[*.twig]
insert_final_newline = false

[Makefile]
indent_style = tab
55 changes: 55 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Define the line ending behavior of the different file extensions
# Set default behavior, in case users don't have core.autocrlf set.
* text=auto
* text eol=lf

# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.php text
*.default text
*.ctp text
*.sql text
*.md text
*.po text
*.js text
*.css text
*.ini text
*.properties text
*.txt text
*.xml text
*.svg text
*.yml text
.htaccess text

# Declare files that will always have CRLF line endings on checkout.
*.bat eol=crlf

# Declare files that will always have LF line endings on checkout.
*.pem eol=lf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.gif binary
*.webp binary
*.ico binary
*.mo binary
*.pdf binary
*.phar binary
*.woff binary
*.woff2 binary
*.ttf binary
*.otf binary
*.eot binary
*.gz binary
*.bz2 binary
*.7z binary
*.zip binary
*.webm binary
*.mp4 binary
*.ogv binary

# Remove files for archives generated using `git archive`
phpstan.neon export-ignore
.travis.yml export-ignore
.github export-ignore
189 changes: 103 additions & 86 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,92 +1,109 @@
tmp/*
[Cc]onfig/core.php
[Cc]onfig/database.php
app/tmp/*
app/[Cc]onfig/database.php
app/[Cc]onfig/email.php
/vendor
build
!empty
lib/Cake/Console/Templates/skel/tmp/*
._*
# CakePHP specific files #
##########################
/config/app_local.php
/config/.env
/logs/*
/tmp/*
/vendor/*
tmp_cli/
logs_cli/

# OS generated files #
######################
.DS_Store
.AppleDouble
.afp*
app/tmp_cli/*
.nfs*
.idea
.vagrant
/nbproject/private/*
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
.directory

# Tool specific files #
#######################
# PHPUnit
.phpunit.result.cache
# PHP Composer
composer.lock
# vim
*~
*.swp
*.swo
__Plugins
__Plugins/*
node_modules
ansible/playbook.retry
app/webroot/userimages/*
app/webroot/img/graphs/*
app/webroot/img/charts/*
app/webroot/js/compressed_components.js
app/webroot/js/compressed_controllers.js
app/webroot/js/compressed_angular_controllers.js
app/webroot/js/compressed_angular_directives.js
app/webroot/js/compressed_angular_services.js
app/Plugin/ArchiveMigration
app/Plugin/AutoreportModule
app/Plugin/AutoreportModule/webroot/tmp/*
app/Plugin/AxiosAssyst
app/Plugin/DiscoveryModule
app/Plugin/DataExportModule
app/Plugin/DesignModule
app/Plugin/DistributeModule
app/Plugin/EventcorrelationModule
app/Plugin/IdoitModule
app/Plugin/MapModule/webroot/img/backgrounds/*
app/Plugin/MapModule/webroot/img/icons/*
app/Plugin/MapModule/webroot/img/temp/
app/Plugin/MassenversandDeModule
app/Plugin/MkModule
app/Plugin/SAPModule
app/Plugin/SlackModule
app/Plugin/MaximoModule
app/Plugin/AlfrescoModule
app/Plugin/LinuxBasicMonitoringModule
app/Plugin/NWCModule
app/Plugin/NrpeModule
app/Plugin/PostgresModule
app/Plugin/WMIModule
app/Plugin/PagerdutyModule
app/Plugin/OpenstreetmapModule
app/Plugin/LinuxBasicMonitoringSSHModule
app/Plugin/VMWAREModule
app/Plugin/WindowsBasicMonitoringNSCPModule
app/Plugin/MasterSelfMonitoringModule
app/Plugin/SatelliteSelfMonitoringModule
app/Plugin/ServicenowModule
app/Plugin/UCSModule
app/Lib/AvailableVersion.php
app/docs/en/administration/systemsettings.md
app/docs/en/api/systemsettings.md
tests
app/webroot/img/logo_custom.png
app/webroot/img/logo_small_custom.png
# sublime text & textmate
*.sublime-*
*.stTheme.cache
*.tmlanguage.cache
*.tmPreferences.cache
# Eclipse
.settings/*
# JetBrains, aka PHPStorm, IntelliJ IDEA
.idea/*
# NetBeans
nbproject/*
# Visual Studio Code
.vscode
# Sass preprocessor
.sass-cache/

!app/Vendor/
app/Vendor/*
!app/Vendor/adldap
!app/Vendor/Date
!app/Vendor/Oauth2
!app/Vendor/imageSmoothArc.php
!app/Vendor/qqFileUploader.php
app/composer.lock
# openITCOCKPIT files #
#######################
docker
schema-dump-default.lock
config/graphite.php
src/Lib/openITCOCKPIT_AvailableVersion.php
webroot/img/userimages
webroot/img/charts
webroot/img/graphs
webroot/dist
ansible_settings.yml
config/after_export.php
config/openitcGrafanaTag.php
config/datasource.php
config/dbbackend.php
config/perfdatabackend.php
webroot/img/logo_custom.png
webroot/img/logo_small_custom.png
webroot/img/logos/logo_custom.png
webroot/img/logos/logo_custom_header.png

# npm modules #
#######################
node_modules
package-lock.json
webroot/package-lock.json
webroot/node_modules

Vendor
Vendor/*
app/.c9

docker
app/Config/after_export.php
app/Config/dbbackend.php
app/Config/perfdatabackend.php
app/Config/graphite.php
app/Plugin/NagiosModule/Config/config.php
# Plugins #
#######################
plugins/config
plugins/AlfrescoModule
plugins/AutoreportModule
plugins/DistributeModule
plugins/EventcorrelationModule
plugins/LinuxBasicMonitoringModule
plugins/LinuxBasicMonitoringSSHModule
plugins/MasterSelfMonitoringModule
plugins/MkModule
plugins/NWCModule
plugins/CheckmkModule
plugins/OpenstreetmapModule
plugins/SAPModule
plugins/SlackModule
plugins/ServicenowModule
plugins/PagerdutyModule
plugins/PostgresModule
plugins/AxiosAssystModule
plugins/DesignModule
plugins/PrometheusModule
plugins/SnmpTrapModule
plugins/TemplateExportModule
plugins/TemplateImportModule
plugins/WindowsBasicMonitoringNSCPModule
plugins/WMIModule
plugins/VMWAREModule
plugins/UCSModule
plugins/SatelliteSelfMonitoringModule
plugins/SAPModule
plugins/MassenversandDeModule
15 changes: 11 additions & 4 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Uncomment the following to prevent the httpoxy vulnerability
# See: https://httpoxy.org/
#<IfModule mod_headers.c>
# RequestHeader unset Proxy
#</IfModule>

<IfModule mod_rewrite.c>
RewriteEngine on
RewriteRule ^$ app/webroot/ [L]
RewriteRule (.*) app/webroot/$1 [L]
</IfModule>
RewriteEngine on
RewriteRule ^(\.well-known/.*)$ $1 [L]
RewriteRule ^$ webroot/ [L]
RewriteRule (.*) webroot/$1 [L]
</IfModule>
Loading

0 comments on commit a47682f

Please sign in to comment.