[Vlibrary-devel] SF.net SVN: vlibrary:[287] branches/VLIBRARY_2_X/playbooks

[<ps...@us...>]

Revision: 287
          http://sourceforge.net/p/vlibrary/code/287
Author:   psteitz
Date:     2017-05-19 19:48:13 +0000 (Fri, 19 May 2017)
Log Message:
-----------
Don't become non-privileged user; various cleanup items.

Modified Paths:
--------------
    branches/VLIBRARY_2_X/playbooks/group_vars/servers
    branches/VLIBRARY_2_X/playbooks/roles/app/tasks/main.yml
    branches/VLIBRARY_2_X/playbooks/roles/backupApp/tasks/main.yml
    branches/VLIBRARY_2_X/playbooks/roles/derby/handlers/main.yml
    branches/VLIBRARY_2_X/playbooks/roles/derby/tasks/main.yml
    branches/VLIBRARY_2_X/playbooks/roles/tomcat/tasks/main.yml

Modified: branches/VLIBRARY_2_X/playbooks/group_vars/servers
===================================================================
--- branches/VLIBRARY_2_X/playbooks/group_vars/servers	2017-05-19 18:27:53 UTC (rev 286)
+++ branches/VLIBRARY_2_X/playbooks/group_vars/servers	2017-05-19 19:48:13 UTC (rev 287)
@@ -7,6 +7,8 @@
 tomcat_version: 8.5.13
 tomcat_home: /opt/apache-tomcat-{{tomcat_version}}
 svn_root: https://svn.code.sf.net/p/vlibrary/code/branches/VLIBRARY_2_X
+jre_path: /usr/lib/jvm/java-8-openjdk-amd64/jre
+#jre_path: /usr/lib/jvm/java-8-oracle/jre
 ansible_managed: Ansible Managed - do not edit.
 
 # default setup using gmail - need to allow insecure apps to access the sending account
@@ -14,7 +16,7 @@
 mail_port: 465
 
 # lets_encrypt true means Let's Encrypt cert will be installed 
-lets_encrypt: true
+lets_encrypt: false
 
 # Hard-coded (sic) list of locations that will be set up in the DB
 location_0: Scottsdale
@@ -21,7 +23,7 @@
 location_1: Austin
 
 # Log level
-log_level: DEBUG
+log_level: INFO
 
 # Location of database backups
 backup_root: /vlibrary/backup

Modified: branches/VLIBRARY_2_X/playbooks/roles/app/tasks/main.yml
===================================================================
--- branches/VLIBRARY_2_X/playbooks/roles/app/tasks/main.yml	2017-05-19 18:27:53 UTC (rev 286)
+++ branches/VLIBRARY_2_X/playbooks/roles/app/tasks/main.yml	2017-05-19 19:48:13 UTC (rev 287)
@@ -24,7 +24,6 @@
     dest: "{{vlibrary_src}}"
     force: yes
   become: true
-  become_user: vlibrary
   register: svn_rev
     
 - name: Download Maven
@@ -43,7 +42,6 @@
     src: mailsender.properties
     dest: "{{vlibrary_src}}/src/main/webapp/WEB-INF/classes/"
   become: true
-  become_user: vlibrary
 
 - name: Inject logging properties
   template:
@@ -50,7 +48,6 @@
     src: log4j.properties
     dest: "{{vlibrary_src}}/src/main/webapp/WEB-INF/classes/"
   become: true
-  become_user: vlibrary
 
 - name: Inject database properties
   template:
@@ -57,7 +54,6 @@
     src: database.properties
     dest: "{{vlibrary_src}}/src/main/webapp/WEB-INF/classes/"
   become: true
-  become_user: vlibrary
 
 - name: Build the app
   command: "{{maven_path}}/mvn -DskipTests clean package"
@@ -64,7 +60,6 @@
   args:
     chdir: "{{vlibrary_src}}"
   become: true
-  become_user: vlibrary
 
 - name: Make war world-readable
   file:

Modified: branches/VLIBRARY_2_X/playbooks/roles/backupApp/tasks/main.yml
===================================================================
--- branches/VLIBRARY_2_X/playbooks/roles/backupApp/tasks/main.yml	2017-05-19 18:27:53 UTC (rev 286)
+++ branches/VLIBRARY_2_X/playbooks/roles/backupApp/tasks/main.yml	2017-05-19 19:48:13 UTC (rev 287)
@@ -4,7 +4,6 @@
     src: database.properties
     dest: "{{vlibrary_src}}/derbyBackup/src/main/java"
   become: true
-  become_user: vlibrary
 
 - name: Build the backup app
   command: "{{maven_path}}/mvn -DskipTests clean package"
@@ -11,7 +10,6 @@
   args:
     chdir: "{{vlibrary_src}}/derbyBackup"
   become: true
-  become_user: vlibrary
 
 - name: Make the all-in-one jar world-readable
   file:
@@ -24,12 +22,11 @@
     src: "{{vlibrary_src}}/derbyBackup/target/derbyBackup-1.0-SNAPSHOT-jar-with-dependencies.jar"
     dest: "/vlibrary"
   become: true
-  become_user: vlibrary
 
 - name: Create the backup directory
   become: true
   file:
-    dest: {{backup_root}}
+    dest: "{{backup_root}}"
     owner: vlibrary
     group: vlibrary
     state: directory
@@ -42,4 +39,4 @@
     minute: "2"
     job: "java -jar /vlibrary/derbyBackup-1.0-SNAPSHOT-jar-with-dependencies.jar" 
   become: true
-  become_user: vlibrary
\ No newline at end of file
+  
\ No newline at end of file

Modified: branches/VLIBRARY_2_X/playbooks/roles/derby/handlers/main.yml
===================================================================
--- branches/VLIBRARY_2_X/playbooks/roles/derby/handlers/main.yml	2017-05-19 18:27:53 UTC (rev 286)
+++ branches/VLIBRARY_2_X/playbooks/roles/derby/handlers/main.yml	2017-05-19 19:48:13 UTC (rev 287)
@@ -4,7 +4,6 @@
     dest: "{{derby_home}}/create.ij"
     state: absent
   become: true
-  become_user: vlibrary
 
 - name: Remove restrict script
   file: 
@@ -11,7 +10,6 @@
     dest: "{{derby_home}}/restrict.ij"
     state: absent
   become: true
-  become_user: vlibrary
 
 - name: Remove locations script
   file: 
@@ -18,4 +16,3 @@
     dest: "{{derby_home}}/locations.ij"
     state: absent
   become: true
-  become_user: vlibrary

Modified: branches/VLIBRARY_2_X/playbooks/roles/derby/tasks/main.yml
===================================================================
--- branches/VLIBRARY_2_X/playbooks/roles/derby/tasks/main.yml	2017-05-19 18:27:53 UTC (rev 286)
+++ branches/VLIBRARY_2_X/playbooks/roles/derby/tasks/main.yml	2017-05-19 19:48:13 UTC (rev 287)
@@ -11,7 +11,7 @@
 - name: Give Derby Java karma
   become: true
   blockinfile:
-    dest: /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.policy
+    dest: "{{jre_path}}/lib/security/java.policy"
     content: |
       grant {
        permission java.net.SocketPermission "localhost:1527", "listen";
@@ -31,7 +31,6 @@
     src: derby.properties
     dest: "{{derby_home}}"
   become: true
-  become_user: vlibrary
 
 - name: Start Derby
   become: true
@@ -42,7 +41,6 @@
     src: create.ij
     dest: "{{derby_home}}"
   become: true
-  become_user: vlibrary
 
 - name: Deploy access restriction ij script
   template: 
@@ -49,7 +47,6 @@
     src: restrict.ij
     dest: "{{derby_home}}"
   become: true
-  become_user: vlibrary
 
 - name: Deploy location creation script
   template: 
@@ -56,7 +53,6 @@
     src: locations.ij
     dest: "{{derby_home}}"
   become: true
-  become_user: vlibrary
 
 - name: Create database
   shell: "{{derby_home}}/bin/ij create.ij"
@@ -65,7 +61,6 @@
     creates: "{{derby_home}}/VLIBRARY"
   notify: Remove create script
   become: true
-  become_user: vlibrary
 
 - name: Restrict access
   shell: "{{derby_home}}/bin/ij restrict.ij"
@@ -73,7 +68,6 @@
     chdir: "{{derby_home}}"
   notify: Remove restrict script
   become: true
-  become_user: vlibrary
 
 - name: Add locations
   shell: "{{derby_home}}/bin/ij locations.ij"
@@ -81,6 +75,6 @@
     chdir: "{{derby_home}}"
   notify: Remove locations script
   become: true
-  become_user: vlibrary
 
 
+

Modified: branches/VLIBRARY_2_X/playbooks/roles/tomcat/tasks/main.yml
===================================================================
--- branches/VLIBRARY_2_X/playbooks/roles/tomcat/tasks/main.yml	2017-05-19 18:27:53 UTC (rev 286)
+++ branches/VLIBRARY_2_X/playbooks/roles/tomcat/tasks/main.yml	2017-05-19 19:48:13 UTC (rev 287)
@@ -44,7 +44,7 @@
   copy: 
     remote_src: true
     src: "{{derby_home}}/lib/derbyclient.jar"
-    dest: /opt/apache-tomcat-{{tomcat_version}}/lib
+    dest: "{{tomcat_home}}/lib"
     
 - name: Deploy the app
   copy: 
@@ -52,7 +52,6 @@
     src: "{{vlibrary_src}}/target/vlibrary.war"
     dest: "{{tomcat_home}}/webapps"
   become: true
-  become_user: tomcat
 
 - name: Create ssl keystore directory
   file:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.