Rehomed to ~dropbox on cli VM

UoA-eResearch · Sep 12, 2024 · 4b76c47 · 4b76c47
1 parent 733cb11
commit 4b76c47
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/bin/add_ldap_group_to_dropbox.rb b/bin/add_ldap_group_to_dropbox.rb
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/home/dropbox/ruby3/bin/ruby
 require 'time'
 require 'wikk_configuration'
 require_relative '../rlib/ldap.rb' # json to class with accessor methods

diff --git a/bin/check4unmanagedfolders.rb b/bin/check4unmanagedfolders.rb
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/home/dropbox/ruby3/bin/ruby
 require 'time'
 require 'wikk_configuration'
 require_relative '../rlib/ldap.rb' # json to class with accessor methods

diff --git a/bin/cleanup.sh b/bin/cleanup.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 #Run from cron (crontab -l)
-#1 8,12,16,20 * * * /home/figshare/dropbox_gen_groups_from_ldap/bin/cron.sh > /home/figshare/dropbox_gen_groups_from_ldap/log/last_run.log 2>&1
-#
-export no_proxy=localhost,127.0.0.1,localaddress,.auckland.ac.nz,keystone.rc.nectar.org.au
-export https_proxy=http://squid.auckland.ac.nz:3128
-export http_proxy=http://squid.auckland.ac.nz:3128
+#1 8,12,16,20 * * * /home/dropbox/bin/cron.sh > /home/dropbox/log/last_run.log 2>&1
 #
+base_dir="/home/dropbox"
+# Now need a proxy to get out
+. ${base_dir}/conf/proxy
+
 RM="/bin/rm"
-LOCKFILE="/home/figshare/bin/lockfile"
+LOCKFILE="${base_dir}/bin/lockfile"
 TMP_DIR="/tmp"
 LOCK_PID_FILE=${TMP_DIR}/dropbox_cleanup.lock
 log_date=`/bin/date "+%Y-%m-%d-%H"`

diff --git a/bin/cron.sh b/bin/cron.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 #Run from cron (crontab -l)
-#1 8,12,16,20 * * * /home/figshare/dropbox_gen_groups_from_ldap/bin/cron.sh > /home/figshare/dropbox_gen_groups_from_ldap/log/last_run.log 2>&1
-#
-export no_proxy=localhost,127.0.0.1,localaddress,.auckland.ac.nz,keystone.rc.nectar.org.au
-export https_proxy=http://squid.auckland.ac.nz:3128
-export http_proxy=http://squid.auckland.ac.nz:3128
+#1 8,12,16,20 * * * /home/dropbox/bin/cron.sh > /home/dropbox/log/last_run.log 2>&1
 #
+base_dir="/home/dropbox"
+# Now need a proxy to get out
+. ${base_dir}/conf/proxy
+
 RM="/bin/rm"
-LOCKFILE="/home/figshare/bin/lockfile"
+LOCKFILE="${base_dir}/bin/lockfile"
 TMP_DIR="/tmp"
 LOCK_PID_FILE=${TMP_DIR}/dropbox_hr_feed.lock
 

diff --git a/bin/gone.rb b/bin/gone.rb
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/home/dropbox/ruby3/bin/ruby
 require 'wikk_configuration'
 require_relative '../rlib/dropbox.rb'
 require_relative '../rlib/uoa.rb' # Localized front ends to dropbox and ldap calls.

diff --git a/bin/team_members.rb b/bin/team_members.rb
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/home/dropbox/ruby3/bin/ruby
 require 'wikk_configuration'
 require_relative '../rlib/dropbox.rb'
 require_relative '../rlib/uoa.rb' # Localized front ends to dropbox and ldap calls.

diff --git a/bin/update_user_profiles.rb b/bin/update_user_profiles.rb
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/home/dropbox/ruby3/bin/ruby
 require 'wikk_configuration'
 require_relative '../rlib/dropbox.rb'
 require_relative '../rlib/uoa.rb' # Localized front ends to dropbox and ldap calls.