Our codebase stopped updating on 10th May. We hadn’t haven’t touched the files listed below. I’ve tried scripts/github-remove -d and then git reset --hard. I’m open to suggestions
Updating to latest codebase FAIL
error: The following untracked working tree files would be overwritten by merge:
app/Checks.php
app/Console/Kernel.php
app/Exceptions/Handler.php
app/Extensions/LegacyUserProvider.php
app/Http/Controllers/AjaxController.php
app/Http/Controllers/Auth/ForgotPasswordController.php
app/Http/Controllers/Auth/LoginController.php
app/Http/Controllers/Auth/RegisterController.php
app/Http/Controllers/Auth/ResetPasswordController.php
app/Http/Controllers/Controller.php
app/Http/Controllers/LegacyController.php
app/Http/Kernel.php
app/Http/Middleware/EncryptCookies.php
app/Http/Middleware/RedirectIfAuthenticated.php
app/Http/Middleware/TrimStrings.php
app/Http/Middleware/VerifyCsrfToken.php
app/Http/ViewComposers/MenuComposer.php
app/Models/Alert.php
app/Models/AlertRule.php
app/Models/Application.php
app/Models/BaseModel.php
app/Models/BgpPeer.php
app/Models/CefSwitching.php
app/Models/Component.php
app/Models/Config.php
app/Models/Dashboard.php
app/Models/Device.php
app/Models/DeviceGroup.php
app/Models/GraphType.php
app/Models/Notification.php
app/Models/NotificationAttrib.php
app/Models/OspfInstance.php
app/Models/Package.php
app/Models/Plugin.php
app/Models/Port.php
app/Models/Processor.php
app/Models/Pseudowire.php
app/Models/Sensor.php
app/Models/Service.php
app/Models/User.php
app/Models/Vrf.php
app/Models/WirelessSensor.php
app/Providers/AppServiceProvider.php
app/Providers/AuthServiceProvider.php
app/Providers/BroadcastServiceProvider.php
app/Providers/ComposerServiceProvider.php
app/Providers/EventServiceProvider.php
app/Providers/RouteServiceProvider.php
artisan
bootstrap/app.php
bootstrap/autoload.php
bootstrap/cache/.gitignore
config/app.php
config/auth.php
config/broadcasting.php
config/cache.php
config/database.php
config/debugbar.php
config/filesystems.php
config/librenms.php
config/mail.php
config/queue.php
config/services.php
config/session.php
config/toastr.php
config/view.php
database/factories/ModelFactory.php
database/migrations/2014_10_12_000000_create_users_table.php
database/migrations/2014_10_12_100000_create_password_resets_table.php
database/seeds/DatabaseSeeder.php
package.json
resources/assets/js/app.js
resources/assets/js/bootstrap.js
resources/assets/js/components/Example.vue
resources/assets/sass/_variables.scss
resources/assets/sass/app.scss
resources/lang/en/auth.php
resources/lang/en/pagination.php
resources/lang/en/passwords.php
resources/lang/en/validation.php
resources/views/laravel.blade.php
resources/views/layouts/librenmsv1.blade.php
resources/views/layouts/menu.blade.php
resources/views/welcome.blade.php
routes/api.php
routes/channels.php
routes/console.php
routes/web.php
server.php
storage/app/.gitignore
storage/app/public/.gitignore
storage/debugbar/.gitignore
storage/framework/cache/.gitignore
storage/framework/sessions/.gitignore
storage/framework/testing/.gitignore
storage/framework/views/.gitignore
storage/logs/.gitignore
webpack.mix.js
Please move or remove them before you can merge.
$ ./validate.php
| Component | Version |
|---|---|
| LibreNMS | 1.39-23-g3e0c26f |
| DB Schema | 249 |
| PHP | 5.6.30-0+deb8u1 |
| MySQL | 5.5.57-0+deb8u1 |
| RRDTool | 1.4.8 |
| SNMP | NET-SNMP 5.7.2.1 |
====================================
[OK] Composer Version: 1.6.5
[OK] Dependencies up-to-date.
[OK] Database connection successful
[OK] Database schema correct
[WARN] Your install is over 24 hours out of date, last update: Tue, 08 May 2018 21:51:21 +0000
[FIX] Make sure your daily.sh cron is running and run ./daily.sh by hand to see if there are any errors.