Skip to content

Commit ed9f139

Browse files
dorianimdorianim
authored
Merge branch 'master' into feat/tests
2 parents e075faf + 92e2a97 commit ed9f139

15 files changed

Lines changed: 112 additions & 44 deletions

File tree

‎.github/workflows/build-and-publish-documentation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
deploy:
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-24.04
1717
steps:
1818
- uses: actions/checkout@v2
1919
with:

‎.github/workflows/preview.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ name: Build preview package
77
jobs:
88
deb-package:
99
name: build DEB-Package
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-24.04
1111
concurrency:
1212
group: ${{ github.ref }}
1313
cancel-in-progress: true
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818

1919
- name: Install dependencies
2020
run: sudo apt update && sudo apt install debhelper build-essential -y
@@ -26,7 +26,7 @@ jobs:
2626
run: mkdir package && cp ../linuxmuster-linuxclient7_* ./package
2727

2828
- name: Upload artifact
29-
uses: actions/upload-artifact@v2
29+
uses: actions/upload-artifact@v4
3030
with:
3131
name: deb-package
3232
path: package/*

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ name: Build Release
1111
jobs:
1212
deb-package:
1313
name: build DEB-Package
14-
runs-on: ubuntu-18.04
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818

1919
- name: Install dependencies
2020
run: sudo apt update && sudo apt install debhelper build-essential -y
@@ -26,7 +26,7 @@ jobs:
2626
run: mkdir package && cp ../linuxmuster-linuxclient7_* ./package
2727

2828
- name: Upload artifact
29-
uses: actions/upload-artifact@v2
29+
uses: actions/upload-artifact@v4
3030
with:
3131
name: deb-package
3232
path: package/*
@@ -35,42 +35,34 @@ jobs:
3535
needs: deb-package
3636
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
3737
name: GitHub Release
38-
runs-on: ubuntu-18.04
38+
runs-on: ubuntu-24.04
3939
steps:
4040
- name: Download artifact
41-
uses: actions/download-artifact@v2
41+
uses: actions/download-artifact@v4.1.7
4242
with:
4343
name: deb-package
4444

4545
- name: Extract current changes
4646
run: cat *.changes | sed '0,/^Changes:$/d' | sed '/Checksums.*/Q' | sed '1,2d' | tail >> ./current-changes
4747

48-
- name: Define distribution variable
48+
- name: Define distribution variables
4949
run: |
5050
export DISTRIBUTION=$(grep -i ^Distribution *.changes | awk -F\: '{ print $2 }' | awk '{ print $1 }')
5151
echo "DISTRIBUTION=$DISTRIBUTION" >> $GITHUB_ENV
5252
5353
export VERSION=$(grep -i ^Version *.changes | awk -F\: '{ print $2 }' | awk '{ print $1 }')
5454
echo "VERSION=$VERSION" >> $GITHUB_ENV
5555
56-
- name: Test if it's a testing prerelease
57-
id: check_prerelease
58-
uses: haya14busa/action-cond@v1
59-
with:
60-
cond: ${{ env.DISTRIBUTION == 'lmn71' }}
61-
if_true: "false"
62-
if_false: "true"
63-
6456
- name: Create Release
6557
id: create_release
66-
uses: actions/create-release@v1
58+
uses: softprops/action-gh-release@v1
6759
env:
6860
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6961
with:
7062
tag_name: ${{ github.ref }}
7163
release_name: Release ${{ env.VERSION }} (${{ env.DISTRIBUTION }})
7264
draft: false
73-
prerelease: ${{ steps.check_prerelease.outputs.value }}
65+
prerelease: false
7466
body_path: ./current-changes
7567

7668
- name: Delete current changes file
@@ -85,7 +77,7 @@ jobs:
8577
release_id: ${{ steps.create_release.outputs.id }}
8678
assets_path: .
8779

88-
publsh:
80+
publish:
8981
needs: deb-package
9082
name: Push latest release to archive repo
9183
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.repository == 'linuxmuster/linuxmuster-linuxclient7'
@@ -99,7 +91,7 @@ jobs:
9991
ssh-add - <<< "${{ secrets.REPO_SSH_KEY }}"
10092
10193
- name: Clone archive repo
102-
uses: actions/checkout@v2
94+
uses: actions/checkout@v3
10395
with:
10496
repository: "linuxmuster/deb"
10597
ssh-key: ${{ secrets.REPO_SSH_KEY }}
@@ -109,7 +101,7 @@ jobs:
109101
run: mkdir "package"
110102

111103
- name: Download artifact
112-
uses: actions/download-artifact@v2
104+
uses: actions/download-artifact@v4.1.7
113105
with:
114106
name: deb-package
115107
path: "./package"

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Linuxmuster.net official | ❌ NO*
3535
:---: | :---:
3636
[Community support](https://ask.linuxmuster.net) | ✅ YES**
3737
Actively developed | ✅ YES
38-
Maintainer organisation | Netzint GmbH
39-
Primary maintainer | dorian@itsblue.de / andreas.till@netzint.de
38+
Maintainer organisation | Linuxmuster.net
39+
Primary maintainer | dorian@itsblue.de
4040

4141
\* Even though this is not an official package, pull requests and issues are being looked at.
4242
** The linuxmuster community consists of people who are nice and happy to help. They are not directly involved in the development though, and might not be able to help in any case.

‎debian/changelog‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
linuxmuster-linuxclient7 (1.0.12) lmn73; urgency=medium
2+
3+
* Implement fixes for Debian 13 (#85)
4+
* Fix issues for new roles partens and staff (#84)
5+
* Pass optionally specified domain to realm discover (#78)
6+
7+
-- Dorian Zedler <dorian@itsblue.de> Sat, 8 Nov 2025 21:51:06 +0200
8+
9+
linuxmuster-linuxclient7 (1.0.11) lmn73; urgency=medium
10+
11+
* Merge pull request #76 from ks98/master, fixes mount problems with Kerberos after cifs-utils update.
12+
13+
-- Thomas Schmitt <thomas@linuxmuster.net> Sat, 19 Jul 2025 15:54:06 +0200
14+
15+
linuxmuster-linuxclient7 (1.0.10) lmn73; urgency=medium
16+
17+
* New package for lmn 7.3
18+
19+
-- Arnaud Kientz <arnaud@linuxmuster.net> Mon, 03 Feb 2025 12:28:41 +0100
20+
121
linuxmuster-linuxclient7 (1.0.9) lmn71; urgency=medium
222

323
- add missing dependency to libsss-sudo

‎debian/control‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Source: linuxmuster-linuxclient7
22
Section: linuxmuster
33
Priority: optional
4-
Maintainer: Dorian Zedler <dorian@itsblue.de>, Andreas Till <andreas.till@netzint.de>
4+
Maintainer: Dorian Zedler <dorian@itsblue.de>
55
Build-Depends: debhelper (>= 5.0.0)
66
Standards-Version: 5.0.0
77

88
Package: linuxmuster-linuxclient7
99
Architecture: all
10-
Depends: python3, python3-ldap, cifs-utils, ldb-tools, bind9-host, ipcalc, hxtools, network-manager, krb5-user, keyutils, samba, sssd, sssd-tools, libsss-sudo, adcli, libpam-sss, sudo, realmd, cups (>= 2.3.0), coreutils
10+
Depends: python3, python3-ldap, cifs-utils, ldb-tools, bind9-host, ipcalc, hxtools, network-manager, krb5-user, keyutils, samba, sssd, sssd-tools, libsss-sudo, adcli, libpam-sss, sudo, realmd, cups (>= 2.3.0), coreutils, libcap2-bin
1111
Description: Package for Ubuntu clients to connect to the linuxmuster.net 7 active directory server.
1212
Conflicts: linuxmuster-client-adsso, linuxmuster-client-adsso7, ni-lmn-client-adsso

‎docs/conf.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ def setup(app):
4545

4646
html_theme = 'sphinx_rtd_theme'
4747
html_logo = '_static/logo.png'
48-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
4948
html_static_path = ['_static']
5049
html_sidebars = {
5150
'**': [
@@ -91,4 +90,4 @@ def setup(app):
9190
'Miscellaneous'),
9291
]
9392

94-
intersphinx_mapping = {'https://docs.python.org/': None}
93+
intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}

‎docs/python/otherHelpers.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This module is used to setup, clean and upgrade the client.
2828

2929
Members
3030
-------
31-
.. automodule:: linuxmusterLinuxclient7.seup
31+
.. automodule:: linuxmusterLinuxclient7.setup
3232
:members:
3333

3434
Module: imageHelper

‎etc/profile.d/99-linuxmuster-linuxclient7.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
scriptDir=$(linuxmuster-linuxclient7 get-constant scriptDir)
1+
scriptDir=$(/usr/sbin/linuxmuster-linuxclient7 get-constant scriptDir)
22
source $scriptDir/executeHookWithEnvFix.sh onLogin

‎etc/sudoers.d/99-linuxmuster-linuxclient7‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#
22
# WARNING! All changes to this file will be overwritten by linuxmuster-linuxclient7 upgrades!
33
#
4-
%examusers ALL=(root) NOPASSWD: /usr/share/linuxmuster-linuxclient7/scripts/sudoTools
5-
%role-student ALL=(root) NOPASSWD: /usr/share/linuxmuster-linuxclient7/scripts/sudoTools
6-
%role-teacher ALL=(root) NOPASSWD: /usr/share/linuxmuster-linuxclient7/scripts/sudoTools
4+
%domain\ users ALL=(root) NOPASSWD: /usr/share/linuxmuster-linuxclient7/scripts/sudoTools
75
%role-schooladministrator ALL=(ALL:ALL) NOPASSWD: ALL
86
%role-globaladministrator ALL=(ALL:ALL) NOPASSWD: ALL

0 commit comments

Comments
 (0)