Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add owncloudsql config to authbasic #3435

Merged
merged 2 commits into from
Apr 1, 2022

Conversation

butonic
Copy link
Member

@butonic butonic commented Mar 31, 2022

This PR allows configuring the authproviders to use the owncloudsql driver.

It allows running an ocis instance next to an already existing owncloud 10 and access the same database with an ocis.yaml config file like this

log:
  level: debug
  pretty: true
  color: true
proxy:
  account_backend: cs3
  enable_basic_auth: true
storage:
  reva:
    ########################################
    # first configure which drivers to use #
    ########################################
    #
    # list users using the owncloudsql driver
    users:
      driver: owncloudsql
    # auth users using the owncloudsql driver
    auth_provider:
      driver: owncloudsql
    # provide users storage using the owncloudsql driver
    storage_users:
      driver: owncloudsql
    #
    ########################################
    # first configure which drivers to use #
    ########################################
    #
    # the user_owncloud_sql config is used for user listing and auth
    user_owncloud_sql:
      db_username: owncloud
      db_password: owncloud
      db_host: mariadb
      #db_port: 
      db_name: owncloud
      idp: "https://cloud.ocis.test"
      #nobody: 
      #join_username: 
      #join_owncloud_uuid: 
      #enable_medial_search: 
    # the user_storage owncloud_sql config is used for the user storage owncloudsql config
    # ... jeez this is getting confusing
    user_storage:
      owncloud_sql:
        # make sure root points to the oc10 data directory. The below works for the official oc10 docker container
        root: /mnt/data/files
        #upload_info_dir: 
        db_username: owncloud
        db_password: owncloud
        db_host: mariadb
        #db_port: 
        db_name: owncloud
    # the sharing oc10-sql driver is mixed with the actual driver configuration
    # ... even more inconsistent as there is no seperate struct.
    # I hope this gets cleaned up when moving to go micro services
    sharing:
      #public_driver: oc10-sql
      user_driver: oc10-sql
      user_sql_username: owncloud
      user_sql_password: owncloud
      user_sql_host: mariadb
      #user_sql_port: 
      user_sql_name: owncloud

tracking in separate issues

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
@butonic butonic marked this pull request as draft March 31, 2022 15:36
@sonarcloud
Copy link

sonarcloud bot commented Mar 31, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
90.9% 90.9% Duplication

@butonic butonic marked this pull request as ready for review April 1, 2022 13:34
@butonic butonic self-assigned this Apr 1, 2022
@butonic butonic requested a review from kobergj April 1, 2022 13:35
@butonic butonic merged commit 90f97f2 into master Apr 1, 2022
@delete-merged-branch delete-merged-branch bot deleted the add-owncloudsql-config-to-authbasic branch April 1, 2022 14:04
ownclouders pushed a commit that referenced this pull request Apr 1, 2022
Merge: 7672f20 70cde8f
Author: Jörn Friedrich Dreyer <jfd@owncloud.com>
Date:   Fri Apr 1 16:04:37 2022 +0200

    Merge pull request #3435 from owncloud/add-owncloudsql-config-to-authbasic

    Add owncloudsql config to authbasic
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants