Skip to content

Commit

Permalink
Merge pull request #2099 from twangboy/fix_repo_path
Browse files Browse the repository at this point in the history 
Fix repo path
  • Loading branch information
@twangboy
twangboy authored Apr 12, 2024
2 parents fd7126a + 3ba2d5f commit 3436de7
Show file tree
Hide file tree
Showing 18 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions auditbeat/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ auditbeat:
{% for version in versions %}
'{{ version }}':
full_name: 'Auditbeat'
installer: 'salt://win/repo-ng/salt-winrepo-ng/auditbeat/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/auditbeat/install.cmd'
install_flags: {{ version }}
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/auditbeat/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/auditbeat/remove.cmd'
cache_dir: True
{% endfor %}
4 changes: 2 additions & 2 deletions bitwarden-cli/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ bitwarden-cli:
{% for version in versions %}
'{{ version }}':
full_name: 'Bitwarden CLI {{ version }}'
installer: 'salt://win/repo-ng/salt-winrepo-ng/bitwarden-cli/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/bitwarden-cli/install.cmd'
install_flags: {{ version }}
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/bitwarden-cli/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/bitwarden-cli/remove.cmd'
cache_dir: True
{% endfor %}
4 changes: 2 additions & 2 deletions chocolatey/init.sls
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
chocolatey:
latest:
full_name: 'Chocolatey'
installer: 'salt://win/repo-ng/salt-winrepo-ng/chocolatey/install.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/chocolatey/uninstall.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/chocolatey/install.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/chocolatey/uninstall.cmd'
cache_dir: True

# this software also has it's own salt execution module, which you might prefer to use, see
Expand Down
4 changes: 2 additions & 2 deletions cwrsync/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ cwrsync:
{% for version in versions %}
'{{ version }}':
full_name: 'cwRsync'
installer: 'salt://win/repo-ng/salt-winrepo-ng/cwrsync/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/cwrsync/install.cmd'
install_flags: {{ version }}
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/cwrsync/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/cwrsync/remove.cmd'
cache_dir: True
{% endfor %}
2 changes: 1 addition & 1 deletion erlang/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ erlang:
{% set major_version = otp_version.split(".")[0] | int %}
'{{ otp_version }}':
full_name: 'Erlang OTP {{ display_version }} ({{ erlang_version }})'
installer: 'salt://win/repo-ng/salt-winrepo-ng/erlang/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/erlang/install.cmd'
install_flags: '"http://erlang.org/download/otp_win{{ BITS }}_{{ otp_version }}.exe" "otp_win{{ BITS }}_{{ otp_version }}.exe" "{{ otp_version }}" "Erlang OTP {{ otp_version.split('.')[0] }} ({{ erlang_version }})" "/S"'
{% if major_version >= 23 %}
uninstaller: '%ProgramFiles%\erl-{{ otp_version }}\Uninstall.exe'
Expand Down
4 changes: 2 additions & 2 deletions filebeat/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ filebeat:
{% for version in versions %}
'{{ version }}':
full_name: 'Filebeat'
installer: 'salt://win/repo-ng/salt-winrepo-ng/filebeat/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/filebeat/install.cmd'
install_flags: {{ version }}
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/filebeat/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/filebeat/remove.cmd'
cache_dir: True
{% endfor %}
4 changes: 2 additions & 2 deletions functionbeat/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ functionbeat:
{% for version in versions %}
'{{ version }}':
full_name: 'Functionbeat'
installer: 'salt://win/repo-ng/salt-winrepo-ng/functionbeat/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/functionbeat/install.cmd'
install_flags: {{ version }}
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/functionbeat/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/functionbeat/remove.cmd'
cache_dir: True
{% endfor %}
4 changes: 2 additions & 2 deletions gpg4win/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ gpg4win:
{{ VERSION }}:
full_name: 'Gpg4win ({{ VERSION }})'
installer: 'http://files.gpg4win.org/gpg4win-{{ VERSION }}.exe'
install_flags: '/S /C="C:\ProgramData\Salt Project\salt\var\cache\salt\minion\files\base\win\repo-ng\salt-winrepo-ng\gpg4win\silent.ini"'
install_flags: '/S /C="C:\ProgramData\Salt Project\salt\var\cache\salt\minion\files\base\win\repo-ng\salt-winrepo-ng\_\gpg4win\silent.ini"'
uninstaller: '{{ PROGRAM_FILES }}\gpg4win\gpg4win-uninstall.exe'
uninstall_flags: '/S'
cache_file: salt://win/repo-ng/salt-winrepo-ng/gpg4win/silent.ini
cache_file: salt://win/repo-ng/salt-winrepo-ng/_/gpg4win/silent.ini
msiexec: False
reboot: False
{% endfor %}
4 changes: 2 additions & 2 deletions heartbeat/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ heartbeat:
{% for version in versions %}
'{{ version }}':
full_name: 'Heartbeat'
installer: 'salt://win/repo-ng/salt-winrepo-ng/heartbeat/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/heartbeat/install.cmd'
install_flags: {{ version }}
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/heartbeat/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/heartbeat/remove.cmd'
cache_dir: True
{% endfor %}
4 changes: 2 additions & 2 deletions metricbeat/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ metricbeat:
{% for version in versions %}
'{{ version }}':
full_name: 'Metricbeat'
installer: 'salt://win/repo-ng/salt-winrepo-ng/metricbeat/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/metricbeat/install.cmd'
install_flags: {{ version }}
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/metricbeat/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/metricbeat/remove.cmd'
cache_dir: True
{% endfor %}
4 changes: 2 additions & 2 deletions packetbeat/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ packetbeat:
{% for version in versions %}
'{{ version }}':
full_name: 'Packetbeat'
installer: 'salt://win/repo-ng/salt-winrepo-ng/packetbeat/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/packetbeat/install.cmd'
install_flags: {{ version }}
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/packetbeat/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/packetbeat/remove.cmd'
cache_dir: True
{% endfor %}
4 changes: 2 additions & 2 deletions patchmypc/init.sls
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
patchmypc:
{% for version in [
'latest'
'latest'
] %}
'{{ version }}':
full_name: 'Patch My PC Home Updater'
installer: 'salt://win/repo-ng/salt-winrepo-ng/patchmypc/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/patchmypc/install.cmd'
install_flags: '"https://patchmypc.com/freeupdater/PatchMyPC.exe" "PatchMyPC.exe" "{{ version }}"'
uninstaller: ''
uninstall_flags: ''
Expand Down
8 changes: 4 additions & 4 deletions pfsensebackup/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
#
pfsensebackup:
{% for version in ['2.6.0',
'2.5.2',
'2.5.1',
'2.5.2',
'2.5.1',
'2.5'] %}
'{{ version }}':
full_name: 'pfSenseBackup {{ version }}'
installer: 'salt://win/repo-ng/salt-winrepo-ng/pfsensebackup/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/pfsensebackup/install.cmd'
install_flags: '"{{ version }}"'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/pfsensebackup/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/pfsensebackup/remove.cmd'
uninstall_flags: '"{{ version }}"'
cache_dir: True
{% endfor %}
Expand Down
4 changes: 2 additions & 2 deletions pycharm-pro/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ pycharm-pro:
{{ build }}:
installer: '{{ url }}/pycharm-professional-{{ version }}.exe'
full_name: 'JetBrains Pycharm {{ version }}'
install_flags: '/S /CONFIG="C:\ProgramData\Salt Project\salt\var\cache\salt\minion\files\base\win\repo-ng\salt-winrepo-ng\pycharm-pro\silent.config"'
cache_file: salt://win/repo-ng/salt-winrepo-ng/pycharm-pro/silent.config
install_flags: '/S /CONFIG="C:\ProgramData\Salt Project\salt\var\cache\salt\minion\files\base\win\repo-ng\salt-winrepo-ng\_\pycharm-pro\silent.config"'
cache_file: salt://win/repo-ng/salt-winrepo-ng/_/pycharm-pro/silent.config
uninstaller: '{{ PROGRAM_FILES }}\JetBrains\PyCharm {{ version }}\Uninstall.exe'
uninstall_flags: '/S'
msiexec: False
Expand Down
4 changes: 2 additions & 2 deletions rsync-git/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ rsync-git:
{% for version in versions %}
'{{ version }}':
full_name: 'rSync for Git'
installer: 'salt://win/repo-ng/salt-winrepo-ng/rsync-git/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/rsync-git/install.cmd'
install_flags: {{ version }}
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/rsync-git/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/rsync-git/remove.cmd'
cache_dir: True
{% endfor %}
4 changes: 2 additions & 2 deletions stayawake/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ stayawake:
{% for version in ['1.0'] %}
'{{ version }}':
full_name: 'StayAwake'
installer: 'salt://win/repo-ng/salt-winrepo-ng/stayawake/install.cmd'
install_flags: '"https://downloads.sourceforge.net/projects/stayawake/" "StayAwake-setup.exe" "1.0" "/S"'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/stayawake/install.cmd'
install_flags: '"https://downloads.sourceforge.net/projects/stayawake/" "StayAwake-setup.exe" "1.0" "/S"'
uninstaller: '{{ PROGRAM_FILES }}\StayAwake\uninstall.exe'
uninstall_flags: '/S'
{% endfor %}
4 changes: 2 additions & 2 deletions topgrade/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ topgrade:
'0.12.0',
'0.11.0',
'0.10.0',
'0.9.0'
'0.9.0'
] %}
'{{ version }}':
full_name: 'TopGrade'
installer: 'salt://win/repo-ng/salt-winrepo-ng/topgrade/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/topgrade/install.cmd'
install_flags: '"https://github.com/r-darwish/topgrade/releases/download/v{{ version }}/topgrade-v{{version }}-x86_64-pc-windows-msvc.zip" "topgrade-v{{version }}-x86_64-pc-windows-msvc.zip" "{{ version }}"'
uninstaller: ''
uninstall_flags: ''
Expand Down
4 changes: 2 additions & 2 deletions winlogbeat/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ winlogbeat:
{% for version in versions %}
'{{ version }}':
full_name: 'Winlogbeat'
installer: 'salt://win/repo-ng/salt-winrepo-ng/winlogbeat/install.cmd'
installer: 'salt://win/repo-ng/salt-winrepo-ng/_/winlogbeat/install.cmd'
install_flags: {{ version }}
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/winlogbeat/remove.cmd'
uninstaller: 'salt://win/repo-ng/salt-winrepo-ng/_/winlogbeat/remove.cmd'
cache_dir: True
{% endfor %}

0 comments on commit 3436de7

Please sign in to comment.