Merge branch 'v4.1-dev' into 'v4.x-master'

430: Finalize debian package publication

See merge request !22

.gitlab-ci.yml

-image: java:8-jdk
+image: java:11-jdk
 
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"
@@ -7,7 +7,7 @@ variables:
 
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
-  - ./gradlew wrapper --distribution-type=bin
+  - ./gradlew wrapper --gradle-version=6.9 --distribution-type=bin
 
 cache:
   paths:
@@ -33,14 +33,14 @@ build:
 deploy:
   stage: deploy
   script:
-    - ./gradlew publish -x test :search-docs:publish $NEXUS_CREDENTIALS
+    - ./gradlew clean -x test :search-ui:publish $NEXUS_CREDENTIALS
   only:
     - v4.x-master
 
 docs:
   stage: deploy
   script:
-    - ./gradlew :search-docs:publish $NEXUS_CREDENTIALS 
+    - ./gradlew clean -x test :search-docs:publish $NEXUS_CREDENTIALS 
   only:
     - v4.x-master
     - docs

docs/build.gradle

@@ -47,7 +47,8 @@ task publishDebPackage {
     def distroPath = "$buildDir/distributions/"
     doLast {
         if (version.endsWith('SNAPSHOT') || version.endsWith('RELEASE')) {
-            println "Publishing Debian package $debFile as user $repoUser";
+            aptRepo = version.endsWith('SNAPSHOT') ? aptTestingRepo : aptReleasesRepo
+            println "Publishing Debian package $debFile as user $repoUser to $aptRepo"
             exec {
                 executable "curl"
                 args "-f", "-u", "$repoUser:$repoPass", "-H", "Content-Type: multipart/form-data", "--data-binary", "@$distroPath$debFile", "$aptRepo";

gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

search-ui/build.gradle

@@ -54,12 +54,14 @@ ospackage {
     
     //installUtils file('scripts/utils.sh')
     //preInstall file('scripts/search.preinst')
-    postInstall file('scripts/search.postinst')
+    postInstall file('scripts/search-ui.postinst')
     //preUninstall file('scripts/preUninstall.sh')
     //postUninstall file('scripts/postUninstall.sh')        
 
  	into "/var/dfa/webapps/$project.name/"
 
+	configurationFile "/etc/dfa/search/search.yml"
+
     // Copy the actual .jar file
     from(war.outputs.files) {
     	include '*.war'
@@ -68,11 +70,7 @@ ospackage {
 	    }
 	    fileMode 0755
     }
-    
-    /*from("scripts/search.service") {
-        into "/etc/systemd/system/"
-    }*/
-	
+    	
 	from("src/main/resources/application.deb.yml") {
         into "/etc/dfa/search"
         fileType = CONFIG | NOREPLACE
@@ -90,10 +88,11 @@ tasks.withType(Deb) {
 }
 
 buildDeb {
-    requires('default-jre').or('default-jre-headless')
+    requires('default-jdk').or('default-jdk-headless')
     requires('mongodb').or('mongodb-org')
+    requires('elasticsearch')
     
-    from("scripts/search.service") {
+    from("scripts/search-ui.service") {
         into "/etc/systemd/system/"
     }
 }

search-ui/src/main/resources/application.deb.yml

+server:
+  port: 8393
+  
+paths:
+  main: /var/lib/dfa/search
+  
+log:
+  dir: /tmp
+#  pattern: "%-4relative [%thread] %-5level %logger{35}[%line]- %msg%n"
+  indexing:
+    baseDir: /tmp/indexing_logs
+  log_queries: false
+
+localization:
+  defaultLocale: de
+  debug: true
+
+theme: dariah-theme
+
+mongo:
+  host: 127.0.0.1
+  port: 27017
+  database: search
+
+contextPath: /search
+baseUrl: http://localhost:8393${contextPath:/}
+#baseUrl: https://externally.visible.example.com${contextPath:/}
+
+spring:
+  mvc:
+    view:
+      prefix: /WEB-INF/views/
+      suffix: .jsp
+
+#logging:
+#  level:
+#    web: DEBUG
+
+#es:
+#  hostname: localhost
+#  port: 9200
+#  useSSL: false
+#  username: 
+#  password: 
+
+indexing:
+  index_name_prefix: gs_
+  index_config_file: index_config.json
+  
+search:
+  log_all_queries: false
+
+datamodels: 
+  integration: 5eb11e106117b10b7b6c7c11
+  indexing: 5a27ab9b0246440d479c6c46
+  presentation: 5b9004394c7b0405ccf90b00
+  metadata: 5cd3f505dd960f585e960f63
+  crawling: 60812e54667bd50488d2b237
+#  modelsWithMessageCodes:
+#    - 598f06e706bffc03a8e44f82
+#    - 598f06e706bffc03a8e44f83
+#  modelsMessageCodePrefix: ~de.mww
+
+# many default options missing here... 
+api:
+  colreg:
+    #base_url: https://teaching.clariah.de/colreg-ui/
+    base_url: http://localhost:8081/
+  dme:
+    base_url: https://teaching.clariah.de/dme/
+
+crawling:
+  max_threads_per_service_type: 6
+  api_access_politeness_span_ms: 200
+
+auth:
+  baseUrl: ${baseUrl}
+  #defaultLoginUrl: ${auth.baseUrl}
+  #defaultLogoutUrl: ${auth.baseUrl}
+  salt: Qmwp4CO7LDkOUDouAcCcUqd9ZGNbRG5Jyr5lpntOuB9
+  permissionHierarchy: ROLE_ADMINISTRATOR > ROLE_CONTRIBUTOR > ROLE_USER
+  permissionDefinitions:
+    - permissionSet: ROLE_ADMINISTRATOR
+      level: 100
+      roleMappings: 
+        local: ["application_admin"]
+        saml: ["generic-search-admins"]       
+    - permissionSet: ROLE_CONTRIBUTOR
+      level: 50
+      roleMappings:
+        local: ["application_contributor"]
+        saml: ["generic-search-contributors"]
+    - permissionSet: ROLE_USER
+      level: 10
+      roleMappings:
+        local: ["application_user"]
+        saml: ["application_user"]
+  local:
+    enabled: true
+    authorizerName: local
+    # Same password for each user: 1234
+    users:
+      - username: 'tgradl'
+        passhash: '$2a$10$EeajSQQUepa7H7.g4xQCaeO.hjUwh0yzYCMrfOkWCZGe1IiWaexa6'
+        roles: ["application_admin"]
+      - username: 'admin'
+        passhash: '$2y$10$nmTcpRxs.RFUstkJJms6U.AW61Jmr64s9VNQLuhpU8gYrgzCapwka'
+        roles: ["application_admin"]
+      - username: 'contributor'
+        passhash: '$2y$10$nmTcpRxs.RFUstkJJms6U.AW61Jmr64s9VNQLuhpU8gYrgzCapwka'
+        roles: ["application_contributor"]
+      - username: 'user'
+        passhash: '$2y$10$nmTcpRxs.RFUstkJJms6U.AW61Jmr64s9VNQLuhpU8gYrgzCapwka'
+        roles: ["application_user"]
+ 
\ No newline at end of file