update of git-sync 2.3.1

config/plugins/git-sync.yaml

@@ -12,7 +12,7 @@ sync:
   cron_enable: false
   cron_at: '0 12,23 * * *'
 local_repository: null
-repository: 'https://dev.sum7.eu/cloudspace/webseite-grav.git'
+repository: 'git@dev.sum7.eu:cloudspace/webseite-grav.git'
 no_user: '1'
 user: null
 password: gitsync-def50200458cedb7ddd95b7d1ccd30763ef3bd893f91d7d9f9c3cf10c5c39029dcaeed1069e12c3744d731170bd1462bbd8e5f715e2f41225dce3f2991043f582befa3d07e377c6ef1cfd32b8a94f52cd99fa8121b24f90e4a3c5f531d82c24dc5c52eb8deb10fcebfb24aa8cdfa038bb636624171d7169c1ae7b320
@@ -26,9 +26,9 @@ remote:
 git:
   author: gituser
   message: '(Grav GitSync) Automatic Commit'
-  name: GitSync
+  name: cloudSpace.WTF
-  email: git-sync@trilby.media
+  email: git-cloudspace.wtf@vela-web
   bin: git
   ignore: null
-  private_key: null
+  private_key: /srv/http/domain/cloudspace.wtf/.ssh/id_rsa
 logging: false

config/system.yaml

@@ -1,44 +1,209 @@
 absolute_urls: false
-
+timezone: ''
+default_locale: null
+param_sep: ':'
+wrapped_site: false
+reverse_proxy_setup: false
+force_ssl: false
+force_lowercase_urls: true
+custom_base_url: ''
+username_regex: '^[a-z0-9_-]{3,16}$'
+pwd_regex: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
+intl_enabled: true
+http_x_forwarded:
+  protocol: true
+  host: false
+  port: true
+  ip: true
+languages:
+  supported: {  }
+  default_lang: null
+  include_default_lang: true
+  include_default_lang_file_extension: true
+  translations: true
+  translations_fallback: true
+  session_store_active: false
+  http_accept_language: false
+  override_locale: false
+  content_fallback: {  }
+  pages_fallback_only: false
 home:
-  alias: '/home'
+  alias: /home
-
+  hide_in_urls: false
 pages:
+  type: regular
   theme: quark
-  markdown:
+  order:
-    extra: false
+    by: default
+    dir: asc
+  list:
+    count: 20
+  dateformat:
+    default: null
+    short: 'jS M Y'
+    long: 'F jS \a\t g:ia'
+  publish_dates: true
   process:
     markdown: true
     twig: false
-
+  twig_first: false
+  never_cache_twig: false
+  events:
+    page: true
+    twig: true
+  markdown:
+    extra: false
+    auto_line_breaks: false
+    auto_url_links: false
+    escape_markup: false
+    special_chars:
+      '>': gt
+      '<': lt
+    valid_link_attributes:
+      - rel
+      - target
+      - id
+      - class
+      - classes
+  types:
+    - html
+    - htm
+    - xml
+    - txt
+    - json
+    - rss
+    - atom
+  append_url_extension: ''
+  expires: 604800
+  cache_control: null
+  last_modified: false
+  etag: true
+  vary_accept_encoding: false
+  redirect_default_code: 302
+  redirect_trailing_slash: 1
+  redirect_default_route: 0
+  ignore_files:
+    - .DS_Store
+  ignore_folders:
+    - .git
+    - .idea
+  ignore_hidden: true
+  hide_empty_folders: false
+  url_taxonomy_filters: true
+  frontmatter:
+    process_twig: false
+    ignore_fields:
+      - form
+      - forms
 cache:
   enabled: true
   check:
     method: file
   driver: auto
-  prefix: 'g'
+  prefix: g
-
+  purge_at: '0 4 * * *'
+  clear_at: '0 3 * * *'
+  clear_job_type: standard
+  clear_images_by_default: true
+  cli_compatibility: false
+  lifetime: 604800
+  gzip: false
+  allow_webserver_gzip: false
+  redis:
+    socket: false
+    password: null
+    database: null
 twig:
   cache: true
   debug: true
   auto_reload: true
   autoescape: true
-
+  undefined_functions: true
+  undefined_filters: true
+  safe_functions: {  }
+  safe_filters: {  }
+  umask_fix: false
 assets:
   css_pipeline: false
+  css_pipeline_include_externals: true
+  css_pipeline_before_excludes: true
   css_minify: true
+  css_minify_windows: false
   css_rewrite: true
   js_pipeline: false
+  js_pipeline_include_externals: true
+  js_pipeline_before_excludes: true
   js_minify: true
-
+  enable_asset_timestamp: false
+  enable_asset_sri: false
+  collections:
+    jquery: 'system://assets/jquery/jquery-2.x.min.js'
 errors:
   display: true
   log: true
-
+log:
+  handler: file
+  syslog:
+    facility: local6
 debugger:
   enabled: false
-  twig: true
+  provider: clockwork
+  censored: false
   shutdown:
     close_connection: true
+  twig: true
+images:
+  default_image_quality: 85
+  cache_all: false
+  cache_perms: '0755'
+  debug: false
+  auto_fix_orientation: true
+  seofriendly: false
+  cls:
+    auto_sizes: false
+    aspect_ratio: false
+    retina_scale: 1
+  defaults:
+    loading: auto
+media:
+  enable_media_timestamp: false
+  unsupported_inline_types: {  }
+  allowed_fallback_types: {  }
+  auto_metadata_exif: false
+  upload_limit: 2097152
+session:
+  enabled: true
+  initialize: true
+  timeout: 1800
+  name: grav-site
+  uniqueness: path
+  secure: false
+  httponly: true
+  samesite: Lax
+  split: true
+  domain: null
+  path: null
 gpm:
+  releases: stable
+  proxy_url: null
+  method: auto
   verify_peer: true
+  official_gpm_only: true
+accounts:
+  type: regular
+  storage: file
+flex:
+  cache:
+    index:
+      enabled: true
+      lifetime: 60
+    object:
+      enabled: true
+      lifetime: 600
+    render:
+      enabled: true
+      lifetime: 600
+strict_mode:
+  yaml_compat: false
+  twig_compat: false
+  blueprint_compat: false

config/themes/darkquark.yaml

@@ -0,0 +1,19 @@
+enabled: true
+production-mode: true
+grid-size: grid-lg
+header-fixed: true
+header-animated: true
+header-dark: true
+header-transparent: false
+sticky-footer: true
+blog-page: /blog
+spectre:
+  exp: false
+  icons: false
+custom_logo:
+  user/themes/quark/images/logo/512px-Cloud-icon.svg.png:
+    name: 512px-Cloud-icon.svg.png
+    type: image/png
+    size: 12290
+    path: user/themes/quark/images/logo/512px-Cloud-icon.svg.png
+custom_logo_mobile: {  }

data/feed/4a70786057421d45bb196c2e24da33c0.yaml

@@ -1,4 +1,4 @@
-last_checked: 1619712228
+last_checked: 1619874579
 data:
   -
     title: 'Skeleton Build Automation'
@@ -44,9 +44,9 @@ data:
     title: 'Raising PHP Requirements... Again'
     url: 'https://getgrav.org/blog/raising-php-requirements-2020'
     date: 1605281160
-    nicetime: '5 months ago'
+    nicetime: '6 months ago'
   -
     title: 'macOS 11.0 Big Sur Apache Setup: LetsEncrypt SSL'
     url: 'https://getgrav.org/blog/macos-bigsur-apache-ssl'
     date: 1605265380
-    nicetime: '5 months ago'
+    nicetime: '6 months ago'

data/flex/indexes/pages.json

@@ -1 +1 @@
-{"version":"1.5","timestamp":1619773521,"count":5,"index":{"":{"key":"","storage_key":"","template":null,"storage_timestamp":1619773521,"children":{"examples":1619773456,"home":1619773521},"checksum":"e7b248a80d858c10474955ca577c47ad"},"examples":{"key":"examples","storage_key":"examples","template":null,"storage_timestamp":1619773456,"children":{"home":1619773426,"typography":1619773404},"checksum":"1e28a668349b5f0c2506e323ac3b5730"},"examples\/home":{"key":"examples\/home","storage_key":"examples\/home","template":"default","storage_timestamp":1619773426,"markdown":{"":{"default":1619773343}},"checksum":"d97a000510efd53cff5999d632e337f3"},"examples\/typography":{"key":"examples\/typography","storage_key":"examples\/typography","template":"default","storage_timestamp":1619773404,"markdown":{"":{"default":1619204223}},"checksum":"354abd48c3145855f6787ec4d3e9de77"},"home":{"key":"home","storage_key":"home","template":"default","storage_timestamp":1619773521,"markdown":{"":{"default":1619773521}},"checksum":"3d91f0f82639196aed915262d3a67ad1"}}}
+{"version":"1.5","timestamp":1619797891,"count":5,"index":{"":{"key":"","storage_key":"","template":null,"storage_timestamp":1619773521,"children":{"examples":1619773456,"home":1619773521},"checksum":"e7b248a80d858c10474955ca577c47ad"},"examples":{"key":"examples","storage_key":"examples","template":null,"storage_timestamp":1619773456,"children":{"home":1619773426,"typography":1619773404},"checksum":"1e28a668349b5f0c2506e323ac3b5730"},"examples\/home":{"key":"examples\/home","storage_key":"examples\/home","template":"default","storage_timestamp":1619773426,"markdown":{"":{"default":1619773343}},"checksum":"d97a000510efd53cff5999d632e337f3"},"examples\/typography":{"key":"examples\/typography","storage_key":"examples\/typography","template":"default","storage_timestamp":1619773404,"markdown":{"":{"default":1619204223}},"checksum":"354abd48c3145855f6787ec4d3e9de77"},"home":{"key":"home","storage_key":"home","template":"default","storage_timestamp":1619797890,"markdown":{"":{"default":1619797890}},"checksum":"adef52c3cd3dd0c8a976c99df2dfbca7"}}}

data/notifications/4a70786057421d45bb196c2e24da33c0.yaml

@@ -1,4 +1,4 @@
-last_checked: 1619774478
+last_checked: 1619874577
 data:
   feed:
     -

data/notifications/genofire.yaml

@@ -0,0 +1 @@
+27: 'Fri, 30 Apr 2021 15:41:59 +0000'

pages/home/default.md

@@ -2,4 +2,5 @@
 title: Home
 ---
 
-# cloudSpace.wtf - Ein dezentraler Chaostreff
+# cloudSpace.wtf
+## Ein dezentraler Chaostreff

plugins/git-sync/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v2.3.1
+## 04/30/2021
+
+1. [](#bugfix)
+   * Fixed regression where `testRepository` would erroneously pass with invalid credentials [#200](https://github.com/trilbymedia/grav-plugin-git-sync/issues/200)
+   * Fixed Exception thrown with `bin/plugin git-sync status` command, preventing `sync` [#200](https://github.com/trilbymedia/grav-plugin-git-sync/issues/200)
+
 # v2.3.0
 ## 04/27/2021
 

plugins/git-sync/blueprints.yaml

@@ -1,7 +1,7 @@
 name: Git Sync
 type: plugin
 slug: git-sync
-version: 2.3.0
+version: 2.3.1
 description: Allows to synchronize portions of Grav with Git Repositories (GitHub, BitBucket, GitLab)
 icon: git
 author:

plugins/git-sync/classes/GitSync.php

@@ -481,7 +481,7 @@ class GitSync extends Git
                 exec($command, $output, $returnValue);
             }
 
-            if ($returnValue !== 0 && (!empty($output) && $returnValue === 5) && !$quiet) {
+            if ($returnValue !== 0 && $returnValue !== 5 && !$quiet) {
                 throw new \RuntimeException(implode("\r\n", $output));
             }
 

plugins/git-sync/cli/StatusCommand.php

@@ -90,7 +90,8 @@ EOF
             Helper::prepareRepository(
               $plugin->getUser() ?? '',
               $password,
-              $repository)
+              $repository),
+            $plugin->getRemote('branch', null),
         );
         $this->console_log($testRepository, $password);