diff options
Diffstat (limited to 'baserock-system-config-sync')
42 files changed, 9 insertions, 463 deletions
diff --git a/baserock-system-config-sync/baserock-system-config-sync b/baserock-system-config-sync/baserock-system-config-sync index c9f2de0..9b00625 100755 --- a/baserock-system-config-sync/baserock-system-config-sync +++ b/baserock-system-config-sync/baserock-system-config-sync @@ -17,13 +17,13 @@ set -eu +: ${mounting_script="$(dirname "$0")/../libexec/mount-system-versions-dir"} -mounting_script="$(dirname "$0")/../libexec/mount-system-versions-dir" +: ${unmount="umount"} usage() { - echo "Usage: $(basename $0) test V1_DIR VU_DIR V2_DIR VT_DIR" >&2 - echo " $(basename $0) merge NEW_VERSION_LABEL" >&2 + echo "Usage: $(basename $0) merge NEW_VERSION_LABEL" >&2 echo " $(basename $0) sync CANONICAL_VERSION_LABEL" >&2 exit 1 } @@ -35,8 +35,7 @@ die () { } -file_type() -{ +file_type() { mode=$(printf '%o\n' 0x$(stat -c %f "$1")) case "$mode" in 140???) echo "socket" ;; @@ -55,7 +54,7 @@ check_same_type() { type1="$(file_type $1)" type2="$(file_type $2)" if [ "$type1" != "$type2" ]; then - die "found two different types for '$3':" \ + die "ERROR: found two different types for '$3':" \ "$type1 and $type2" fi } @@ -173,20 +172,7 @@ if [ "$#" = 0 ]; then fi -if [ "$1" = "test" ]; then - if [ "$#" != 5 ]; then - usage "$0" - fi - local v1="$2" - local vu="$3" - local v2="$4" - local vt="$5" - mkdir -p "$vt" - # For every pathname in V1, Vuser, or V2 - merge "$v1" "$v1" "$vu" "$v2" "$vt" - merge "$vu" "$v1" "$vu" "$v2" "$vt" - merge "$v2" "$v1" "$vu" "$v2" "$vt" -elif [ "$1" = "merge" ]; then +if [ "$1" = "merge" ]; then if [ "$#" != 2 ]; then usage "$0" fi @@ -194,6 +180,7 @@ elif [ "$1" = "merge" ]; then local mounting_point=$(mktemp -d) "$mounting_script" "$mounting_point" if [ ! -d "$mounting_point/systems/$new_version" ]; then + "$unmount" "$mounting_point" die "Error: version not found - '$new_version'" fi local v1_dir="$mounting_point/systems/default/orig/etc" @@ -201,7 +188,7 @@ elif [ "$1" = "merge" ]; then local v2_dir="$mounting_point/systems/$new_version/run/etc" local vt_dir="$mounting_point/systems/$new_version/run/etc.new" mkdir "$vt_dir" - + trap 'rm -rvf "$vt_dir"; "$unmount" "$mounting_point"' EXIT # For every pathname in V1, Vuser, or V2 merge "$v1_dir" "$v1_dir" "$vu_dir" "$v2_dir" "$vt_dir" merge "$vu_dir" "$v1_dir" "$vu_dir" "$v2_dir" "$vt_dir" @@ -209,11 +196,11 @@ elif [ "$1" = "merge" ]; then rm -rf "$v2_dir" mv "$vt_dir" "$v2_dir" - umount "$mounting_point" elif [ "$1" = "sync" ]; then local canonical_version="$2" local mounting_point=$(mktemp -d) "$mounting_script" "$mounting_point" + trap '"$unmount" "$mounting_point"' EXIT if [ ! -d "$mounting_point/systems/$canonical_version" ]; then die "Error: version not found - '$canonical_version'" fi @@ -228,7 +215,6 @@ elif [ "$1" = "sync" ]; then rm -rf "$version_dir/run/etc.old" fi done - umount "$mounting_point" else usage "$0" fi diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1 deleted file mode 120000 index 6a93f4f..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1 +++ /dev/null @@ -1 +0,0 @@ -afile
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile b/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config deleted file mode 100644 index 98fa27e..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config +++ /dev/null @@ -1,123 +0,0 @@ -# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options override the -# default value. - -#Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -# The default requires explicit activation of protocol 1 -#Protocol 2 - -# HostKey for protocol version 1 -#HostKey /etc/ssh/ssh_host_key -# HostKeys for protocol version 2 -#HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_dsa_key -#HostKey /etc/ssh/ssh_host_ecdsa_key - -# Lifetime and size of ephemeral version 1 server key -#KeyRegenerationInterval 1h -#ServerKeyBits 1024 - -# Logging -# obsoletes QuietMode and FascistLogging -#SyslogFacility AUTH -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -#PermitRootLogin yes -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#RSAAuthentication yes -#PubkeyAuthentication yes - -# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 -# but this is overridden so installations will only check .ssh/authorized_keys -AuthorizedKeysFile .ssh/authorized_keys - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#RhostsRSAAuthentication no -# similar for protocol version 2 -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# RhostsRSAAuthentication and HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! -#PasswordAuthentication yes -#PermitEmptyPasswords no - -# Change to no to disable s/key passwords -#ChallengeResponseAuthentication yes - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin without-password". -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -#UsePAM no - -#AllowAgentForwarding yes -#AllowTcpForwarding yes -#GatewayPorts no -#X11Forwarding no -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PrintMotd yes -#PrintLastLog yes -#TCPKeepAlive yes -#UseLogin no -#UsePrivilegeSeparation yes -PermitUserEnvironment yes -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS yes -#PidFile /var/run/sshd.pid -#MaxStartups 10 -#PermitTunnel no -#ChrootDirectory none - -# no default banner path -#Banner none - -# override default of no subsystems -Subsystem sftp /usr/lib/openssh/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# ForceCommand cvs server - -AcceptEnv LANG LC_* diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config deleted file mode 100644 index 4e6a5d3..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config +++ /dev/null @@ -1,123 +0,0 @@ -# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options override the -# default value. - -#Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -# The default requires explicit activation of protocol 1 -#Protocol 2 - -# HostKey for protocol version 1 -#HostKey /etc/ssh/ssh_host_key -# HostKeys for protocol version 2 -#HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_dsa_key -#HostKey /etc/ssh/ssh_host_ecdsa_key - -# Lifetime and size of ephemeral version 1 server key -#KeyRegenerationInterval 1h -#ServerKeyBits 1024 - -# Logging -# obsoletes QuietMode and FascistLogging -#SyslogFacility AUTH -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -#PermitRootLogin yes -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#RSAAuthentication yes -#PubkeyAuthentication yes - -# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 -# but this is overridden so installations will only check .ssh/authorized_keys -AuthorizedKeysFile .ssh/authorized_keys - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#RhostsRSAAuthentication no -# similar for protocol version 2 -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# RhostsRSAAuthentication and HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! -#PasswordAuthentication yes -#PermitEmptyPasswords no - -# Change to no to disable s/key passwords -#ChallengeResponseAuthentication yes - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin without-password". -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -#UsePAM no - -#AllowAgentForwarding yes -#AllowTcpForwarding yes -#GatewayPorts no -#X11Forwarding no -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PrintMotd yes -#PrintLastLog yes -#TCPKeepAlive yes -#UseLogin no -#UsePrivilegeSeparation yes -PermitUserEnvironment yes -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS yes -#PidFile /var/run/sshd.pid -#MaxStartups 10 -#PermitTunnel no -ChrootDirectory none - -# no default banner path -#Banner none - -# override default of no subsystems -Subsystem sftp /usr/lib/openssh/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# ForceCommand cvs server - -AcceptEnv LANG LC_* diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config deleted file mode 100644 index c4b25e9..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config +++ /dev/null @@ -1,123 +0,0 @@ -# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options override the -# default value. - -#Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -# The default requires explicit activation of protocol 1 -#Protocol 2 - -# HostKey for protocol version 1 -#HostKey /etc/ssh/ssh_host_key -# HostKeys for protocol version 2 -#HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_dsa_key -#HostKey /etc/ssh/ssh_host_ecdsa_key - -# Lifetime and size of ephemeral version 1 server key -#KeyRegenerationInterval 1h -#ServerKeyBits 1024 - -# Logging -# obsoletes QuietMode and FascistLogging -#SyslogFacility AUTH -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -#PermitRootLogin yes -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#RSAAuthentication yes -#PubkeyAuthentication yes - -# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 -# but this is overridden so installations will only check .ssh/authorized_keys -AuthorizedKeysFile .ssh/authorized_keys - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#RhostsRSAAuthentication no -# similar for protocol version 2 -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# RhostsRSAAuthentication and HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! -#PasswordAuthentication yes -#PermitEmptyPasswords no - -# Change to no to disable s/key passwords -#ChallengeResponseAuthentication yes - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin without-password". -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -#UsePAM no - -#AllowAgentForwarding yes -#AllowTcpForwarding yes -#GatewayPorts no -#X11Forwarding no -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PrintMotd yes -#PrintLastLog yes -#TCPKeepAlive yes -UseLogin no -#UsePrivilegeSeparation yes -PermitUserEnvironment yes -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS yes -#PidFile /var/run/sshd.pid -#MaxStartups 10 -#PermitTunnel no -#ChrootDirectory none - -# no default banner path -#Banner none - -# override default of no subsystems -Subsystem sftp /usr/lib/openssh/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# ForceCommand cvs server - -AcceptEnv LANG LC_* diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1 deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1 +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1 deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1 +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1 deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1 +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1 deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1 +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1 deleted file mode 120000 index 6a93f4f..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1 +++ /dev/null @@ -1 +0,0 @@ -afile
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1 deleted file mode 120000 index d09a60b..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1 +++ /dev/null @@ -1 +0,0 @@ -../v1f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2 deleted file mode 120000 index d09a60b..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2 +++ /dev/null @@ -1 +0,0 @@ -../v1f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3 deleted file mode 120000 index d09a60b..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3 +++ /dev/null @@ -1 +0,0 @@ -../v1f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1 deleted file mode 120000 index e4b01f1..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1 +++ /dev/null @@ -1 +0,0 @@ -../v2f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3 deleted file mode 120000 index e4b01f1..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3 +++ /dev/null @@ -1 +0,0 @@ -../v2f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4 deleted file mode 120000 index e4b01f1..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4 +++ /dev/null @@ -1 +0,0 @@ -../v2f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1 deleted file mode 120000 index fcf9fc4..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1 +++ /dev/null @@ -1 +0,0 @@ -../vuf
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2 deleted file mode 120000 index fcf9fc4..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2 +++ /dev/null @@ -1 +0,0 @@ -../vuf
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4 deleted file mode 120000 index fcf9fc4..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4 +++ /dev/null @@ -1 +0,0 @@ -../vuf
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1 deleted file mode 100644 index b73be5d..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=v1 -version=v1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4 deleted file mode 100644 index 9972a7a..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=v1,v2 -version=v1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5 deleted file mode 100644 index 8fbeda2..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=v1,vu -version=v1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7 deleted file mode 100644 index 7c1f4fb..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=v1,vu,v2 -version=v1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1 deleted file mode 100644 index d579e7b..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1 +++ /dev/null @@ -1,8 +0,0 @@ -a=1 -b=2 -c=3 -whereami=v1,vu,v2 -version=v1 -d=1 -e=2 -f=3 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1 deleted file mode 100644 index 1cb075e..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1 +++ /dev/null @@ -1,10 +0,0 @@ -qeq asda d -s -d -a sd -a -d -a -d - -d diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4 deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4 +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3 deleted file mode 100644 index b1580e3..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=vu -version=v2 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4 deleted file mode 100644 index ebc4914..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=v1,v2 -version=v2 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6 deleted file mode 100644 index e76efb0..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=vu,v2 -version=v2 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7 deleted file mode 100644 index 93c46eb..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=v1,vu,v2 -version=v2 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1 deleted file mode 100644 index 2462a4f..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1 +++ /dev/null @@ -1,8 +0,0 @@ -a=1 -b=2 -c=3 -whereami=v1,vu,v2 -version=v2 -d=1 -e=2 -f=3 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1 deleted file mode 100644 index 1cb075e..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1 +++ /dev/null @@ -1,10 +0,0 @@ -qeq asda d -s -d -a sd -a -d -a -d - -d diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4 deleted file mode 100644 index e69de29..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4 +++ /dev/null diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2 deleted file mode 100644 index 9fa9381..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=vu -version=vu diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5 deleted file mode 100644 index eddf4ca..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=v1,vu -version=vu diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6 deleted file mode 100644 index 9802a97..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=vu,v2 -version=vu diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7 deleted file mode 100644 index 24553ad..0000000 --- a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7 +++ /dev/null @@ -1,2 +0,0 @@ -whereami=v1,vu,v2 -version=vu |