From 363171d04e5d7aa6b3d10e1f0990cfb0f0a1f607 Mon Sep 17 00:00:00 2001 From: Dominika Hodovska Date: Wed, 7 Jun 2017 15:45:25 +0200 Subject: [PATCH 01/14] Init modulemd file --- samba.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 samba.yaml diff --git a/samba.yaml b/samba.yaml new file mode 100644 index 0000000..9881e02 --- /dev/null +++ b/samba.yaml @@ -0,0 +1,22 @@ +document: modulemd +version: 1 +data: + name: '' + stream: '' + summary: Server and Client software to interoperate with Windows machines + version: 0 + dependencies: + buildrequires: {bootstrap: f26} + requires: {bootstrap: f26} + description: 'Samba is the standard Windows interoperability suite of programs for + Linux and Unix.' + license: + content: [GPLv3+ and LGPLv3+] + module: [MIT] + api: + rpms: [samba] + components: + rpms: + samba: {buildorder: 10, rationale: Runtime dependency.} + + From 9f373d34ba3f281c5fac830be1142a864e7a3165 Mon Sep 17 00:00:00 2001 From: Dominika Hodovska Date: Mon, 12 Jun 2017 17:32:01 +0200 Subject: [PATCH 02/14] Expand api packages --- samba.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samba.yaml b/samba.yaml index 9881e02..f6878d7 100644 --- a/samba.yaml +++ b/samba.yaml @@ -14,7 +14,7 @@ data: content: [GPLv3+ and LGPLv3+] module: [MIT] api: - rpms: [samba] + rpms: [samba, samba-common, samba-client] components: rpms: samba: {buildorder: 10, rationale: Runtime dependency.} From 35193e7f841096d4a1c00e58cc3a31b1cde604d7 Mon Sep 17 00:00:00 2001 From: Dominika Hodovska Date: Mon, 12 Jun 2017 17:32:35 +0200 Subject: [PATCH 03/14] Add basic test --- Dockerfile | 29 +++++++++++++++++++++++++++++ Makefile | 16 ++++++++++++++++ files/config.sh | 6 ++++++ files/config.yaml | 2 ++ files/mako-render.py | 23 +++++++++++++++++++++++ files/smb.conf.mako | 20 ++++++++++++++++++++ files/start.sh | 38 ++++++++++++++++++++++++++++++++++++++ tests/Makefile | 7 +++++++ tests/config.yaml | 23 +++++++++++++++++++++++ tests/generated.py | 17 +++++++++++++++++ tests/generated.pyc | Bin 0 -> 874 bytes 11 files changed, 181 insertions(+) create mode 100644 Dockerfile create mode 100644 Makefile create mode 100755 files/config.sh create mode 100644 files/config.yaml create mode 100644 files/mako-render.py create mode 100644 files/smb.conf.mako create mode 100755 files/start.sh create mode 100644 tests/Makefile create mode 100644 tests/config.yaml create mode 100644 tests/generated.py create mode 100644 tests/generated.pyc diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..cd596a2 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +FROM docker.io/fedora:25 + +MAINTAINER "James Antill" + +RUN dnf install -y --setopt=tsflags=nodocs samba && \ + dnf install -y --setopt=tsflags=nodocs /usr/bin/pidof && \ + dnf install -y --setopt=tsflags=nodocs python-mako PyYAML && \ + dnf -y clean all + +ADD files /files + +# mkdir -p /srv/samba/Demo/ +RUN mkdir -p /srv/samba +RUN /files/config.sh + +RUN sh -c 'date > /srv/samba/tst-build' + +EXPOSE 138/udp +EXPOSE 139 +EXPOSE 445 +EXPOSE 137/udp +EXPOSE 445/udp + + +# VOLUME ['/var/log', '/srv/samba'] + +# USER samba + +CMD ["/files/start.sh"] diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..3ceab2a --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +IMAGE_NAME = samba + +MODULEMDURL=file://samba.yaml + +default: run + +build: + docker build --tag=$(IMAGE_NAME) . + +run: build + docker run -d $(IMAGE_NAME) + +test: build + cd tests; MODULE=docker MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all + cd tests; MODULE=rpm MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all + diff --git a/files/config.sh b/files/config.sh new file mode 100755 index 0000000..04b4cdc --- /dev/null +++ b/files/config.sh @@ -0,0 +1,6 @@ +#! /bin/sh -e + +echo Config. +python /files/mako-render.py /files/smb.conf.mako /files/config.yaml \ + > /etc/samba/smb.conf + diff --git a/files/config.yaml b/files/config.yaml new file mode 100644 index 0000000..a95ab22 --- /dev/null +++ b/files/config.yaml @@ -0,0 +1,2 @@ +mounts: + - /srv/samba diff --git a/files/mako-render.py b/files/mako-render.py new file mode 100644 index 0000000..af7e9e8 --- /dev/null +++ b/files/mako-render.py @@ -0,0 +1,23 @@ +#!/usr/bin/python + +from __future__ import print_function, unicode_literals + +import argparse +import mako.template +import yaml + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument("template") + parser.add_argument("data") + options = parser.parse_args() + + with open(options.template) as stream: + template = mako.template.Template(stream.read()) + with open(options.data) as stream: + data = yaml.load(stream) + + print(template.render(**data)) + +if __name__ == '__main__': + main() diff --git a/files/smb.conf.mako b/files/smb.conf.mako new file mode 100644 index 0000000..d942f4b --- /dev/null +++ b/files/smb.conf.mako @@ -0,0 +1,20 @@ + +[global] + server string = Samba Server Version %v + security = user + map to guest = bad user + # guest account = samba + hosts allow = * + dead time = 15 + socket options = TCP_NODELAY SO_KEEPALIVE SO_RCVBUF=17520 SO_SNDBUF=17520 IPTOS_LOWDELAY + +[public] + comment = Public test + path = /srv/samba + public = yes + guest ok = yes + read only = yes + printable = no + writeable = no + browseable = yes + diff --git a/files/start.sh b/files/start.sh new file mode 100755 index 0000000..70fc982 --- /dev/null +++ b/files/start.sh @@ -0,0 +1,38 @@ +#! /bin/sh -e + +function first +{ + echo $1 +} + +function rest +{ + shift + echo $@ +} + +date > /srv/samba/tst-run + +/usr/sbin/nmbd -D +/usr/sbin/smbd -D + +waits="1 1 2 4 8 16 32 64 360" + +while pidof smbd > /dev/null && pidof nmbd > /dev/null ; do + date + echo "SMBd proces" $(pidof smbd) + echo "NMBd proces" $(pidof nmbd) + sleep $(first $waits) + if [ "x$(rest $waits)" != "x" ]; then + waits="$(rest $waits)" + fi + echo +done + +if ! pidof nmbd; then + echo "NMBd is not running." +fi + +if ! pidof smbd; then + echo "SMBd is not running." +fi diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..fa94987 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,7 @@ +MODULE_LINT=/usr/share/moduleframework/tools/modulelint.py +CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py + +# +all: + generator + $(CMD) diff --git a/tests/config.yaml b/tests/config.yaml new file mode 100644 index 0000000..43a4585 --- /dev/null +++ b/tests/config.yaml @@ -0,0 +1,23 @@ +document: modularity-testing +version: 1 +name: samba +modulemd-url: http://pkgs.fedoraproject.org/cgit/modules/samba.git/tree/samba.yaml +service: + port: [138/udp, 139, 445, 137/udp, 445/udp] +packages: + rpms: + - samba +module: + docker: + start: "docker run -it -P" + labels: + description: "Server and Client software to interoperate with Windows machines" + io.k8s.description: "Server and Client software to interoperate with Windows machines" + source: https://github.com/container-images/samba.git + container: docker.io/modularitycontainers/samba + rpm: + start: /usr/sbin/smbd & + repo: https://kojipkgs.stg.fedoraproject.org/compose/branched/jkaluza/latest-Fedora-Modular-26/compose/Server/x86_64/os/ +test: + processrunning: + - 'ls /proc/*/exe -alh | grep smbd' diff --git a/tests/generated.py b/tests/generated.py new file mode 100644 index 0000000..7a60065 --- /dev/null +++ b/tests/generated.py @@ -0,0 +1,17 @@ +#!/usr/bin/python + +import socket +from avocado import main +from moduleframework import module_framework + +if __name__ == '__main__': + main() + +class GeneratedTestsConfig(module_framework.AvocadoTest): + """ + :avocado: enable + """ + + def test_processrunning(self): + self.start() + self.run("ls /proc/*/exe -alh | grep smbd") diff --git a/tests/generated.pyc b/tests/generated.pyc new file mode 100644 index 0000000000000000000000000000000000000000..f945da1c3bbe091f970ab8d3785ae76f8fa87527 GIT binary patch literal 874 zcmb_a!EV$r6dXI*Eeb`f1QHTle2kF5_Z6z3J#gzG<>$cl(yidaxaR_ro?m17Hj{853Uv_)0wuHj?{BA%+XzubcXD8b&?mY2E-JpcFh) zDVhEOC=(P{x#Who05YYNTH0G*S?8CEdb?_A+^iUgU+%r&{&xWGfSYk3!IfapdoemQ zfnEj$pbbjt-QX+zUega!A8fl(cd8y}r$V=KBY&JRXtYC&oWQU@dcckZYS%f(Gk(Gn zfZq6ywA*;+Z^Kp(wDUn%brbbuSkS?CE2|@WqU(Paecb(wuh?h`(Xb>6Vc7S5)7LMV zh}j@Ak#ljhy0;w}6SK+pDGn1kIb)o!j48POukR^D7VH5tj*8~VT;`m6ob#5iwiHJJ z$D|5Y9eIFB-s5E{II&{<^ErSoQ?PtbMuMl+JlgeXQgFul0}pU27Gfb!MJE3OXxhYf literal 0 HcmV?d00001 From b813a07f7e80eb92e956952b0a304e8dc4c8c63e Mon Sep 17 00:00:00 2001 From: Dominika Hodovska Date: Tue, 13 Jun 2017 09:22:25 +0200 Subject: [PATCH 04/14] Add test for samba configuration --- tests/sanity.py | 51 +++++++++++++++++++++++++++++++++++++++++ tests/smbconfig.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 tests/sanity.py create mode 100644 tests/smbconfig.py diff --git a/tests/sanity.py b/tests/sanity.py new file mode 100644 index 0000000..5a09e1e --- /dev/null +++ b/tests/sanity.py @@ -0,0 +1,51 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# This Modularity Testing Framework helps you to write tests for modules +# Copyright (C) 2017 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# he Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Authors: Dominika Hodovska +# + +from avocado import main +from avocado.core import exceptions +from moduleframework import module_framework + + +class SanityCheck(module_framework.AvocadoTest): + """ + :avocado: enable + """ + + def test(self): + """ + Simple sanity test + """ + + self.start() + self.run("ls / | grep bin") + + def testSambaVersion(self): + """ + Check if httpd is installed in correct version + """ + version = "4.5" + self.start() + self.run("smbcontrol -V | grep {}".format(version)) + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/tests/smbconfig.py b/tests/smbconfig.py new file mode 100644 index 0000000..5ef2646 --- /dev/null +++ b/tests/smbconfig.py @@ -0,0 +1,57 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# This Modularity Testing Framework helps you to write tests for modules +# Copyright (C) 2017 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# he Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Authors: Dominika Hodovska +# + +from avocado import main +from avocado.core import exceptions +from moduleframework import module_framework + + +class SmbConfCheck(module_framework.AvocadoTest): + """ + :avocado: enable + """ + def testTestParamFail(self): + """ + Valid failure of testparam + """ + + self.start() + + self.run("testparm -s > /smb-fail") + self.run("printf \"\\n[fail]\\n\\tcomment = bad config\\n\" >> /smb-fail") + # No path + self.run("testparm -s /smb-fail > /out.txt") + self.run("cat out.txt | grep \"available = No\"") + + self.run("rm /out.txt") + self.run("testparm -s > /smb-fail") + + # bad mask + self.run("printf \"\\n[fail]\\n\\tcomment = bad config\\n\" >> /smb-fail") + self.run("printf \"\\tcreate mask = 9999\\n\" >> /smb-fail") + self.run("testparm -s /smb-fail > /out.txt; [ $? -ne 0 ]") + + self.run("[ ! -s /out.txt ]") + +if __name__ == '__main__': + main() From 5c17235e27297e14e3cddbbe0d6d18e40d78a792 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 5 Sep 2017 15:22:33 +0200 Subject: [PATCH 05/14] initial import Signed-off-by: Igor Gnatenko --- samba.yaml | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 samba.yaml diff --git a/samba.yaml b/samba.yaml new file mode 100644 index 0000000..f3f1bc7 --- /dev/null +++ b/samba.yaml @@ -0,0 +1,90 @@ +document: modulemd +version: 1 +data: + summary: samba module + description: This samba module has been generated. + license: + module: + - MIT + dependencies: + buildrequires: + bootstrap: master + requires: + platform: master + references: + community: https://docs.pagure.org/modularity/ + documentation: https://github.com/modularity-modules/samba + tracker: https://github.com/modularity-modules/samba + api: + rpms: + - libldb + - libsmbclient + - libtalloc + - libtdb + - libtevent + - libwbclient + - python2-samba + - samba + - samba-client-libs + - samba-common + - samba-common-libs + - samba-common-tools + - samba-dc-libs + - samba-libs + - samba-winbind + - samba-winbind-modules + profiles: + default: + description: A generated profile based on top-lvl package list. + rpms: + - libldb + - libsmbclient + - libtalloc + - libtdb + - libtevent + - libwbclient + - python2-samba + - samba + - samba-client-libs + - samba-common + - samba-common-libs + - samba-common-tools + - samba-dc-libs + - samba-libs + - samba-winbind + - samba-winbind-modules + components: + rpms: + avahi: + rationale: Generated. + ref: f27 + cups: + rationale: Generated. + ref: f27 + libldb: + rationale: Generated. + ref: f27 + libtalloc: + rationale: Generated. + ref: f27 + libtdb: + rationale: Generated. + ref: f27 + libtevent: + rationale: Generated. + ref: f27 + libtomcrypt: + rationale: Generated. + ref: f27 + libtommath: + rationale: Generated. + ref: f27 + python-crypto: + rationale: Generated. + ref: f27 + python-dns: + rationale: Generated. + ref: f27 + samba: + rationale: Generated. + ref: f27 From 5201bd029d7a9a20da339213f7aad69d6f4fb48d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 5 Sep 2017 16:53:05 +0200 Subject: [PATCH 06/14] bump to fetch fix in python-crypto Signed-off-by: Igor Gnatenko From 80d160f463e917517ca8a99e1bd8cfedb663e276 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 5 Sep 2017 17:21:41 +0200 Subject: [PATCH 07/14] drop python components, they will be in pythonX-ecosystem Signed-off-by: Igor Gnatenko --- samba.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/samba.yaml b/samba.yaml index f3f1bc7..fa0c7e1 100644 --- a/samba.yaml +++ b/samba.yaml @@ -79,12 +79,6 @@ data: libtommath: rationale: Generated. ref: f27 - python-crypto: - rationale: Generated. - ref: f27 - python-dns: - rationale: Generated. - ref: f27 samba: rationale: Generated. ref: f27 From dda6c34916009af221f155fb5d975e2d78e4df8a Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 17 Oct 2017 13:49:19 +0200 Subject: [PATCH 08/14] add, profiles, use git hashes --- samba.yaml | 62 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/samba.yaml b/samba.yaml index fa0c7e1..0ae77ee 100644 --- a/samba.yaml +++ b/samba.yaml @@ -8,9 +8,11 @@ data: - MIT dependencies: buildrequires: - bootstrap: master + bootstrap: f27 requires: - platform: master + platform: f27 + python2: master + python2-ecosystem: master references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/samba @@ -53,32 +55,70 @@ data: - samba-libs - samba-winbind - samba-winbind-modules + client: + description: SMB File sharing client + rpms: + - libsmbclient + - libtalloc + - libtdb + - libtevent + - samba-client + - samba-client-libs + - samba-common + - samba-common-libs + - samba-common-tools + server: + description: SMB File sharing server + rpms: + - libldb + - libtalloc + - libtdb + - libtevent + - samba + - samba-common + - samba-common-libs + - samba-common-tools + - samba-libs + domainclient: + description: SMB Domain Client + rpms: + - libtalloc + - libtdb + - libtevent + - libwbclient + - samba-client-libs + - samba-common + - samba-common-libs + - samba-common-tools + - samba-libs + - samba-winbind + - samba-winbind-modules components: rpms: avahi: rationale: Generated. - ref: f27 + ref: a6503e5fb6fca60591386d6e230f3e64cb90c1b1 cups: rationale: Generated. - ref: f27 + ref: d4e17e51c444d9a52ed986b726b5fe188c6be117 libldb: rationale: Generated. - ref: f27 + ref: b274427c6b205f333ffa46b8971494fcfa741272 libtalloc: rationale: Generated. - ref: f27 + ref: deb9e63676931770aabadd3039f865f7dabf6274 libtdb: rationale: Generated. - ref: f27 + ref: 7c5946d824a69fb0b45098505dacf32435896fff libtevent: rationale: Generated. - ref: f27 + ref: b0f1467f23f8b2425c1b81e1fe70d3b3c2588191 libtomcrypt: rationale: Generated. - ref: f27 + ref: da70e3e4cbae149773da65be071903467bb66b77 libtommath: rationale: Generated. - ref: f27 + ref: c92091ce4d0d98da1c38a17e5f3638a574d990a1 samba: rationale: Generated. - ref: f27 + ref: 4ad8e2a87467580c2252b418f115688656a093fe From 5e514d60b53adc83ace84c767688036a66be10b9 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 17 Oct 2017 15:40:29 +0200 Subject: [PATCH 09/14] drop libtalloc, libtevent, reorder --- samba.yaml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/samba.yaml b/samba.yaml index 0ae77ee..4a879f4 100644 --- a/samba.yaml +++ b/samba.yaml @@ -21,9 +21,7 @@ data: rpms: - libldb - libsmbclient - - libtalloc - libtdb - - libtevent - libwbclient - python2-samba - samba @@ -41,9 +39,7 @@ data: rpms: - libldb - libsmbclient - - libtalloc - libtdb - - libtevent - libwbclient - python2-samba - samba @@ -59,9 +55,7 @@ data: description: SMB File sharing client rpms: - libsmbclient - - libtalloc - libtdb - - libtevent - samba-client - samba-client-libs - samba-common @@ -71,9 +65,7 @@ data: description: SMB File sharing server rpms: - libldb - - libtalloc - libtdb - - libtevent - samba - samba-common - samba-common-libs @@ -82,9 +74,7 @@ data: domainclient: description: SMB Domain Client rpms: - - libtalloc - libtdb - - libtevent - libwbclient - samba-client-libs - samba-common @@ -104,15 +94,10 @@ data: libldb: rationale: Generated. ref: b274427c6b205f333ffa46b8971494fcfa741272 - libtalloc: - rationale: Generated. - ref: deb9e63676931770aabadd3039f865f7dabf6274 + buildorder: 5 libtdb: rationale: Generated. ref: 7c5946d824a69fb0b45098505dacf32435896fff - libtevent: - rationale: Generated. - ref: b0f1467f23f8b2425c1b81e1fe70d3b3c2588191 libtomcrypt: rationale: Generated. ref: da70e3e4cbae149773da65be071903467bb66b77 @@ -122,3 +107,4 @@ data: samba: rationale: Generated. ref: 4ad8e2a87467580c2252b418f115688656a093fe + buildorder: 10 From aa830be8c937e792fb2a1aa5920d767b87e48177 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 18 Oct 2017 14:32:54 +0200 Subject: [PATCH 10/14] master branch should use only master references --- samba.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/samba.yaml b/samba.yaml index 4a879f4..c3bd28f 100644 --- a/samba.yaml +++ b/samba.yaml @@ -8,9 +8,9 @@ data: - MIT dependencies: buildrequires: - bootstrap: f27 + bootstrap: master requires: - platform: f27 + platform: master python2: master python2-ecosystem: master references: @@ -87,17 +87,17 @@ data: rpms: avahi: rationale: Generated. - ref: a6503e5fb6fca60591386d6e230f3e64cb90c1b1 + ref: 64b07e2fc1d770e12b97ef0296a62f80984d88c0 cups: rationale: Generated. - ref: d4e17e51c444d9a52ed986b726b5fe188c6be117 + ref: b85c292042537a333350465e946606907214aeb5 libldb: rationale: Generated. - ref: b274427c6b205f333ffa46b8971494fcfa741272 + ref: 7e985261b595814e9066d32b1ce234da0bd71f54 buildorder: 5 libtdb: rationale: Generated. - ref: 7c5946d824a69fb0b45098505dacf32435896fff + ref: 94c6c6d0e350e5e35776aace06cd0fafbaaa800d libtomcrypt: rationale: Generated. ref: da70e3e4cbae149773da65be071903467bb66b77 @@ -106,5 +106,5 @@ data: ref: c92091ce4d0d98da1c38a17e5f3638a574d990a1 samba: rationale: Generated. - ref: 4ad8e2a87467580c2252b418f115688656a093fe + ref: a837b0f42b94701c0db55ab736a32753f1b93131 buildorder: 10 From ec2b601b615e3ab60da05a447713f1c4f843b35d Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 23 Oct 2017 19:03:13 +0200 Subject: [PATCH 11/14] bump From 5d5dfd64d896c6097e6b3e68bec6d161c56d96ab Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 24 Oct 2017 13:22:43 +0200 Subject: [PATCH 12/14] update libldb and samba version --- samba.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samba.yaml b/samba.yaml index c3bd28f..1950c33 100644 --- a/samba.yaml +++ b/samba.yaml @@ -93,7 +93,7 @@ data: ref: b85c292042537a333350465e946606907214aeb5 libldb: rationale: Generated. - ref: 7e985261b595814e9066d32b1ce234da0bd71f54 + ref: df8cc6a1d9e2bb5296a46287ce03390b1201e5da buildorder: 5 libtdb: rationale: Generated. @@ -106,5 +106,5 @@ data: ref: c92091ce4d0d98da1c38a17e5f3638a574d990a1 samba: rationale: Generated. - ref: a837b0f42b94701c0db55ab736a32753f1b93131 + ref: 8b94bf9ddc2a818eace810b47957650b47383389 buildorder: 10 From 5a4816b512369a7dfb7b8ea4a8013354c242449b Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 31 Oct 2017 12:38:33 -0400 Subject: [PATCH 13/14] Add domaincontroller profile Signed-off-by: Stephen Gallagher --- samba.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/samba.yaml b/samba.yaml index 1950c33..368f746 100644 --- a/samba.yaml +++ b/samba.yaml @@ -83,6 +83,10 @@ data: - samba-libs - samba-winbind - samba-winbind-modules + domaincontroller: + description: Windows Domain Controller + rpms: + - samba-dc components: rpms: avahi: From 8791141cd7979f51b109c03983720f3893afcf47 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 7 Nov 2017 17:00:49 +0100 Subject: [PATCH 14/14] remove libtom* packages Signed-off-by: Igor Gnatenko --- samba.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/samba.yaml b/samba.yaml index 368f746..9b06615 100644 --- a/samba.yaml +++ b/samba.yaml @@ -13,6 +13,7 @@ data: platform: master python2: master python2-ecosystem: master + libtom: master references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/samba @@ -102,12 +103,6 @@ data: libtdb: rationale: Generated. ref: 94c6c6d0e350e5e35776aace06cd0fafbaaa800d - libtomcrypt: - rationale: Generated. - ref: da70e3e4cbae149773da65be071903467bb66b77 - libtommath: - rationale: Generated. - ref: c92091ce4d0d98da1c38a17e5f3638a574d990a1 samba: rationale: Generated. ref: 8b94bf9ddc2a818eace810b47957650b47383389