Skip to content
Snippets Groups Projects
Commit 9afd5cbd authored by Klas Arvidsson's avatar Klas Arvidsson
Browse files

Merge branch 'devel' into 'production'

Devel

See merge request !14
parents b17c46d1 4b41fa46
No related branches found
No related tags found
2 merge requests!30Merge branch 'cherry-pick-b940cfc1' into 'test',!14Devel
Pipeline #60893 passed
// Java API reference
^https?://docs\.oracle\.com/javase/7/docs/api/.* true
^https?://docs\.oracle\.com/en/java/javase/11/docs/api/.* true
^https?://docs\.oracle\.com/en/dcommon/js/.*\.js true
^https?://www\.oracleimg\.com/us/assets/metrics/ora_docs\.js true
^https?://docs\.oracle\.com/favicon\.ico true
// Ahmed Java API reference
^https?://www\.ida\.liu\.se/~TDDC77/extra/api-7/.* true
......@@ -52,6 +52,7 @@ class aes::aes_sw {
# todo: logrotate
service { 'aes_login' :
ensure => 'running',
enable => true,
}
file { '/etc/systemd/system/aes_ms.service':
......@@ -89,6 +90,7 @@ class aes::aes_sw {
# todo: logrotate
service { 'aes_ms' :
ensure => 'running',
enable => true,
}
exec { 'script-repo-updated':
......
......@@ -120,5 +120,6 @@ class aes::auth(
service { $auth_service :
ensure => 'running',
enable => true,
}
}
......@@ -60,6 +60,7 @@ class aes::auth_keydb {
service { $keydb_service :
ensure => 'running',
enable => true,
}
# These are temporary until the AdmC database is up and running.
......@@ -74,4 +75,5 @@ class aes::auth_keydb {
service { 'aes_temp_userdb' :
ensure => 'running',
}}
\ No newline at end of file
}
}
\ No newline at end of file
......@@ -100,5 +100,6 @@ class aes::broker {
service { $broker_service :
ensure => 'running',
enable => true,
}
}
......@@ -12,6 +12,9 @@ class aes {
package {
[
'devtoolset-7',
'gcc',
'gcc-c++',
'libaio',
'python36',
]:
ensure => installed,
......
......@@ -63,6 +63,7 @@ class aes::squid_filter {
# todo: logrotate
service { 'squid' :
ensure => 'running',
enable => true,
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment