Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dtu-enote-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
enote
dtu-enote-core
Commits
51a743e5
Commit
51a743e5
authored
8 years ago
by
Iain Bryson
Browse files
Options
Downloads
Patches
Plain Diff
Remove couchdb config references.
parent
77666b38
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dtu-auth2/lib/models/course2.rb
+1
-12
1 addition, 12 deletions
dtu-auth2/lib/models/course2.rb
with
1 addition
and
12 deletions
dtu-auth2/lib/models/course2.rb
+
1
−
12
View file @
51a743e5
...
@@ -13,7 +13,6 @@ module DTUAuth2
...
@@ -13,7 +13,6 @@ module DTUAuth2
attr_accessor
:enabled
attr_accessor
:enabled
attr_accessor
:askbot_enabled
attr_accessor
:askbot_enabled
attr_accessor
:sharelatex_enabled
attr_accessor
:sharelatex_enabled
attr_accessor
:couchdb_url
attr_accessor
:sharelatex
attr_accessor
:sharelatex
attr_accessor
:populate_time
attr_accessor
:populate_time
...
@@ -27,16 +26,11 @@ module DTUAuth2
...
@@ -27,16 +26,11 @@ module DTUAuth2
instance_values
instance_values
end
end
def
self
.
get_coucbdb_map
(
couchdb_filename
=
File
.
join
(
CachedAuthorizationManager
.
instance
.
dtu_course_config_root
,
'couchdb.yaml'
))
YAML
::
load_file
(
couchdb_filename
)
end
def
self
.
get_sharelatex_map
(
sharelatex_filename
=
File
.
join
(
CachedAuthorizationManager
.
instance
.
dtu_course_config_root
,
'sharelatex.yaml'
))
def
self
.
get_sharelatex_map
(
sharelatex_filename
=
File
.
join
(
CachedAuthorizationManager
.
instance
.
dtu_course_config_root
,
'sharelatex.yaml'
))
YAML
::
load_file
(
sharelatex_filename
)
YAML
::
load_file
(
sharelatex_filename
)
end
end
def
self
.
from_yml
(
courses_filename
=
File
.
join
(
CachedAuthorizationManager
.
instance
.
dtu_course_config_root
,
'courses.yaml'
),
def
self
.
from_yml
(
courses_filename
=
File
.
join
(
CachedAuthorizationManager
.
instance
.
dtu_course_config_root
,
'courses.yaml'
),
couchdb_filename
=
File
.
join
(
CachedAuthorizationManager
.
instance
.
dtu_course_config_root
,
'couchdb.yaml'
),
sharelatex_filename
=
File
.
join
(
CachedAuthorizationManager
.
instance
.
dtu_course_config_root
,
'sharelatex.yaml'
)
)
sharelatex_filename
=
File
.
join
(
CachedAuthorizationManager
.
instance
.
dtu_course_config_root
,
'sharelatex.yaml'
)
)
courses
=
[]
courses
=
[]
...
@@ -45,15 +39,12 @@ module DTUAuth2
...
@@ -45,15 +39,12 @@ module DTUAuth2
Rails
.
logger
.
info
'Initializing from'
Rails
.
logger
.
info
'Initializing from'
Rails
.
logger
.
info
"
\t
campus dumper courses file:
#{
courses_filename
.
to_s
}
"
Rails
.
logger
.
info
"
\t
campus dumper courses file:
#{
courses_filename
.
to_s
}
"
Rails
.
logger
.
info
"
\t
couchdb config file:
#{
couchdb_filename
.
to_s
}
"
Rails
.
logger
.
info
"
\t
sharelatex config file:
#{
sharelatex_filename
.
to_s
}
"
Rails
.
logger
.
info
"
\t
sharelatex config file:
#{
sharelatex_filename
.
to_s
}
"
@courses_filename
=
courses_filename
@courses_filename
=
courses_filename
@couchdb_filename
=
couchdb_filename
@sharelatex_filename
=
sharelatex_filename
@sharelatex_filename
=
sharelatex_filename
@course_map
=
YAML
::
load_file
(
@courses_filename
)
@course_map
=
YAML
::
load_file
(
@courses_filename
)
@couchdb_map
=
self
.
get_coucbdb_map
@couchdb_filename
@sharelatex_map
=
self
.
get_sharelatex_map
@sharelatex_filename
@sharelatex_map
=
self
.
get_sharelatex_map
@sharelatex_filename
admin_user
=
User2
.
system_user
()
admin_user
=
User2
.
system_user
()
...
@@ -62,14 +53,12 @@ module DTUAuth2
...
@@ -62,14 +53,12 @@ module DTUAuth2
@course_map
.
each
do
|
id
,
vals
|
@course_map
.
each
do
|
id
,
vals
|
raise
ArgumentError
.
new
(
"course
#{
id
}
is missing couchdb configuration from
#{
@couchdb_filename
}
"
)
unless
@couchdb_map
[
id
]
and
@couchdb_map
[
id
][
'db'
]
raise
ArgumentError
.
new
(
"course
#{
id
}
is missing sharelatex configuration from
#{
@sharelatex_filename
}
"
)
unless
@sharelatex_map
[
id
]
raise
ArgumentError
.
new
(
"course
#{
id
}
is missing sharelatex configuration from
#{
@sharelatex_filename
}
"
)
unless
@sharelatex_map
[
id
]
Rails
.
logger
.
info
'Initializing course '
+
id
Rails
.
logger
.
info
'Initializing course '
+
id
Rails
.
logger
.
info
'Initializing course '
+
vals
.
ai
Rails
.
logger
.
info
'Initializing course '
+
vals
.
ai
course
=
DTUAuth2
::
Course2
.
new
(
_id:
id
,
enabled:
vals
[
'website_enabled'
],
name:
vals
[
'name'
],
couchdb_url:
@couchdb_map
[
id
][
'db'
],
sharelatex:
@sharelatex_map
[
id
],
populate_time:
File
.
mtime
(
@courses_filename
).
to_i
,
askbot_enabled:
vals
[
'askbot_enabled'
],
sharelatex_enabled:
vals
[
'sharelatex_enabled'
])
course
=
DTUAuth2
::
Course2
.
new
(
_id:
id
,
enabled:
vals
[
'website_enabled'
],
name:
vals
[
'name'
],
sharelatex:
@sharelatex_map
[
id
],
populate_time:
File
.
mtime
(
@courses_filename
).
to_i
,
askbot_enabled:
vals
[
'askbot_enabled'
],
sharelatex_enabled:
vals
[
'sharelatex_enabled'
])
courses
<<
course
courses
<<
course
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment