Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace novell url in SLE-15-SP2 #43

Merged
merged 17 commits into from
Jun 9, 2021
Merged

Replace novell url in SLE-15-SP2 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cc2d3b0
adapt Rakefile and Dockerfile for SLE-12-SP4
jreidinger Apr 23, 2018
1dfcd49
Replace novell sites by SUSE ones for testing.
teclator Jul 6, 2018
c255b3e
Bump version & changelog.
teclator Jul 19, 2019
ec53d4c
Merge pull request #19 from yast/remove_novell
teclator Jul 19, 2019
6b6d502
Merge branch 'SLE-12-SP3' into merge_SLE-12-SP3
teclator Jul 19, 2019
be027e0
adapt Rakefile and Dockerfile for SLE-12-SP5
dgdavid Jul 19, 2019
6c74783
Merge pull request #31 from yast/merge_SLE-12-SP3
teclator Jul 19, 2019
cf9066d
Add Yard options file
dgdavid Jul 22, 2019
6d07b59
Update .gitignore
dgdavid Jul 22, 2019
e6cdfc6
Merge pull request #32 from yast/fix_gitignore
lslezak Jul 23, 2019
4e6a238
Merge remote-tracking branch 'origin/SLE-12-SP4' into merge_sp4
lslezak Aug 15, 2019
843e032
Merge pull request #33 from yast/merge_sp4
lslezak Aug 15, 2019
21754f1
Merge branch 'SLE-12-SP5' into merge_SLE-12-SP5
teclator Jun 9, 2021
b9c610b
Merge pull request #41 from yast/merge_SLE-12-SP5
teclator Jun 9, 2021
a74ba86
Merge branch 'SLE-15-GA' into merge_SLE-15-SP1
teclator Jun 9, 2021
9128f15
Merge pull request #42 from yast/merge_SLE-15-SP1
teclator Jun 9, 2021
2a47ae1
Merge branch 'SLE-15-SP1' into merge_SLE-15-SP1
teclator Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions package/yast2-proxy.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 09 09:59:49 UTC 20201 - Knut Anderssen <kanderssen@suse.com>

- Replace novell urls by SUSE ones (bsc#1100366)
- 4.2.3

-------------------------------------------------------------------
Thu Aug 22 12:53:15 CEST 2019 - schubi@suse.de

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-proxy.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-proxy
Version: 4.2.2
Version: 4.2.3
Release: 0
Summary: YaST2 - Proxy Configuration
License: GPL-2.0-or-later
Expand Down
10 changes: 5 additions & 5 deletions src/modules/Proxy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ def RunTestProxy(http_proxy, https_proxy, ftp_proxy, proxy_user, proxy_password)
# /usr/bin/curl --verbose
# --proxy http://server_name:port_number
# --proxy-user user:password
# --url http://www.novell.com or ftp://ftp.novell.com | suggested for HTTP or FTP test
# --url https://secure-www.novell.com --insecure
# --url http://www.suse.com or ftp://ftp.suse.com | suggested for HTTP or FTP test
# --url https://www.suse.com --insecure
ret = {}

test_http = http_proxy != "" && http_proxy != "http://" ? true : false
Expand All @@ -296,22 +296,22 @@ def RunTestProxy(http_proxy, https_proxy, ftp_proxy, proxy_user, proxy_password)
http_proxy.shellescape,
user_pass,
timeout_sec,
"http://www.novell.com"
"http://www.suse.com"
)
# adding option --insecure to accept the certificate without asking
https_command = Builtins.sformat(
command,
https_proxy.shellescape,
user_pass,
timeout_sec,
"https://secure-www.novell.com --insecure"
"https://www.suse.com --insecure"
)
ftp_command = Builtins.sformat(
command,
ftp_proxy.shellescape,
user_pass,
timeout_sec,
"ftp://ftp.novell.com"
"ftp://ftp.suse.com"
)

Builtins.y2milestone("Running HTTP_PROXY test...")
Expand Down