forked from rc/classroom
		
	Merge pull request #5 from kllemen/main
Nekaj sprememb za predmete PPJ, FP in KIRV
This commit is contained in:
		
						commit
						4b7b16aa14
					
				
					 25 changed files with 87 additions and 127 deletions
				
			
		| 
						 | 
				
			
			@ -1,7 +1,8 @@
 | 
			
		|||
# Kriptografija in računalniška varnost
 | 
			
		||||
# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si
 | 
			
		||||
# Klemen.Klanjscek@fri.uni-lj.si
 | 
			
		||||
# GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client
 | 
			
		||||
dependencies:
 | 
			
		||||
  - role: sagemath
 | 
			
		||||
  - role: jupyter
 | 
			
		||||
  - role: openssl
 | 
			
		||||
 | 
			
		||||
# SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
 | 
			
		||||
# - include_tasks: sagemath.yml
 | 
			
		||||
- include_tasks: jupyter.yml
 | 
			
		||||
- include_tasks: openssl.yml
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,25 +1,25 @@
 | 
			
		|||
- name: Check Haskell install status
 | 
			
		||||
  win_stat:
 | 
			
		||||
    path: C:\ghcup\bin\ghc.exe
 | 
			
		||||
  register: file
 | 
			
		||||
# - name: Check Haskell install status
 | 
			
		||||
#   win_stat:
 | 
			
		||||
#     path: C:\ghcup\bin\ghc.exe
 | 
			
		||||
#   register: file
 | 
			
		||||
 | 
			
		||||
- when: not file.stat.exists
 | 
			
		||||
  block:
 | 
			
		||||
    - name: Download Haskell
 | 
			
		||||
      win_get_url:
 | 
			
		||||
        url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
 | 
			
		||||
        dest: 'C:\'
 | 
			
		||||
      register: download
 | 
			
		||||
# - when: not file.stat.exists
 | 
			
		||||
#   block:
 | 
			
		||||
#     - name: Download Haskell
 | 
			
		||||
#       win_get_url:
 | 
			
		||||
#         url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
 | 
			
		||||
#         dest: 'C:\'
 | 
			
		||||
#       register: download
 | 
			
		||||
    
 | 
			
		||||
    - name: Install Haskell
 | 
			
		||||
      win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
 | 
			
		||||
#     - name: Install Haskell
 | 
			
		||||
#       win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
 | 
			
		||||
 | 
			
		||||
    - name: Add Haskell to PATH
 | 
			
		||||
      win_path:
 | 
			
		||||
        elements:
 | 
			
		||||
          C:\ghcup\bin
 | 
			
		||||
#     - name: Add Haskell to PATH
 | 
			
		||||
#       win_path:
 | 
			
		||||
#         elements:
 | 
			
		||||
#           C:\ghcup\bin
 | 
			
		||||
 | 
			
		||||
    - name: Remove temporary files
 | 
			
		||||
      win_file:
 | 
			
		||||
        path: "{{ download.dest }}"
 | 
			
		||||
        state: absent
 | 
			
		||||
#     - name: Remove temporary files
 | 
			
		||||
#       win_file:
 | 
			
		||||
#         path: "{{ download.dest }}"
 | 
			
		||||
#         state: absent
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
# Digitalna forenzika
 | 
			
		||||
# Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 | 
			
		||||
# Windows, GNU/Linux, GNS3, VirtualBox
 | 
			
		||||
- include_tasks: GNS3.yml
 | 
			
		||||
- include_tasks: gns3.yml
 | 
			
		||||
- include_tasks: virtualbox.yml
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,15 +0,0 @@
 | 
			
		|||
- name: Add GNS3 repository
 | 
			
		||||
  apt_repository:
 | 
			
		||||
    repo: ppa:gns3/ppa
 | 
			
		||||
    state: present
 | 
			
		||||
    update_cache: True
 | 
			
		||||
    validate_certs: False
 | 
			
		||||
- name: Install gns3 server
 | 
			
		||||
  ansible.builtin.apt:
 | 
			
		||||
    name: gns3-server
 | 
			
		||||
    state: latest
 | 
			
		||||
- name: Install gns3 GUI
 | 
			
		||||
  ansible.builtin.apt:
 | 
			
		||||
    name: gns3-gui
 | 
			
		||||
    state: latest
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
# Komunikacijski protokoli in omrežna varnost
 | 
			
		||||
# Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 | 
			
		||||
# Windows, GNU/Linux, GNS3, VirtualBox
 | 
			
		||||
- include_tasks: GNS3.yml
 | 
			
		||||
- include_tasks: gns3.yml
 | 
			
		||||
- include_tasks: virtualbox.yml
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,8 @@
 | 
			
		|||
# Kriptografija in računalniška varnost
 | 
			
		||||
# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si
 | 
			
		||||
# Klemen.Klanjscek@fri.uni-lj.si
 | 
			
		||||
# GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client
 | 
			
		||||
 | 
			
		||||
- include_tasks: sagemath.yml
 | 
			
		||||
# SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
 | 
			
		||||
# - include_tasks: sagemath.yml
 | 
			
		||||
- include_tasks: jupyter.yml
 | 
			
		||||
- include_tasks: openssl.yml
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
- include_tasks: vscode.yml
 | 
			
		||||
- include_tasks: ocaml.yml
 | 
			
		||||
- include_tasks: eclipse.yml
 | 
			
		||||
- include_tasks: haskell.yml
 | 
			
		||||
- include_tasks: swi-prolog.yml
 | 
			
		||||
- include_tasks: rlwrap.yml
 | 
			
		||||
- include_tasks: utop.yml
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										0
									
								
								roles/linroom/tasks/htop.yml
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								roles/linroom/tasks/htop.yml
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -1,9 +1,10 @@
 | 
			
		|||
- name: Install SageMath
 | 
			
		||||
  apt:
 | 
			
		||||
    name: sagemath
 | 
			
		||||
    state: latest
 | 
			
		||||
# # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
 | 
			
		||||
# - name: Install SageMath
 | 
			
		||||
#   apt:
 | 
			
		||||
#     name: sagemath
 | 
			
		||||
#     state: latest
 | 
			
		||||
 | 
			
		||||
- name: Install SageMath - Jupyter
 | 
			
		||||
  apt:
 | 
			
		||||
    name: sagemath-jupyter
 | 
			
		||||
    state: latest
 | 
			
		||||
# - name: Install SageMath - Jupyter
 | 
			
		||||
#   apt:
 | 
			
		||||
#     name: sagemath-jupyter
 | 
			
		||||
#     state: latest
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,3 +11,8 @@
 | 
			
		|||
    name: elpa-sml-mode
 | 
			
		||||
    state: latest
 | 
			
		||||
 | 
			
		||||
# - name: Readline for SML
 | 
			
		||||
#   lineinfile:
 | 
			
		||||
#     dest: "$HOME/.bashrc"
 | 
			
		||||
#     line: "alias smlnj='rlwrap sml'"
 | 
			
		||||
#     insertafter: EOF
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										4
									
								
								roles/linroom/tasks/utop.yml
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								roles/linroom/tasks/utop.yml
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,4 @@
 | 
			
		|||
- name: Install utop
 | 
			
		||||
  apt:
 | 
			
		||||
    name: utop
 | 
			
		||||
    state: latest
 | 
			
		||||
| 
						 | 
				
			
			@ -1,9 +1,7 @@
 | 
			
		|||
VSCode_Extensions:
 | 
			
		||||
  - VisualStudioExptTeam.vscodeintellicode
 | 
			
		||||
  - arthurwang.vsc-prolog
 | 
			
		||||
  - dramforever.vscode-ghc-simple
 | 
			
		||||
  - AmauryRabouan.new-vsc-prolog
 | 
			
		||||
  - eamodio.gitlens
 | 
			
		||||
  - justusadam.language-haskell
 | 
			
		||||
  - ms-dotnettools.csdevkit # IS-63714
 | 
			
		||||
  - ms-python.python
 | 
			
		||||
  - ms-vscode.cpptools
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,9 +1,10 @@
 | 
			
		|||
- name: Install SageMath
 | 
			
		||||
  apt:
 | 
			
		||||
    name: sagemath
 | 
			
		||||
    state: latest
 | 
			
		||||
# # SageMath se se prevede za Ubutnu 24.04: https://github.com/sagemath/sage/issues/38051#issuecomment-2123452861
 | 
			
		||||
# - name: Install SageMath
 | 
			
		||||
#   apt:
 | 
			
		||||
#     name: sagemath
 | 
			
		||||
#     state: latest
 | 
			
		||||
 | 
			
		||||
- name: Install SageMath - Jupyter
 | 
			
		||||
  apt:
 | 
			
		||||
    name: sagemath-jupyter
 | 
			
		||||
    state: latest
 | 
			
		||||
# - name: Install SageMath - Jupyter
 | 
			
		||||
#   apt:
 | 
			
		||||
#     name: sagemath-jupyter
 | 
			
		||||
#     state: latest
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1 +0,0 @@
 | 
			
		|||
# TODO
 | 
			
		||||
| 
						 | 
				
			
			@ -1,16 +1,14 @@
 | 
			
		|||
VSCode_Extensions:
 | 
			
		||||
  - VisualStudioExptTeam.vscodeintellicode
 | 
			
		||||
  - arthurwang.vsc-prolog
 | 
			
		||||
  - dramforever.vscode-ghc-simple
 | 
			
		||||
  - AmauryRabouan.new-vsc-prolog
 | 
			
		||||
  - eamodio.gitlens
 | 
			
		||||
  - justusadam.language-haskell
 | 
			
		||||
  - ms-dotnettools.csdevkit # IS-63714
 | 
			
		||||
  - ms-python.python
 | 
			
		||||
  - ms-vscode.cpptools
 | 
			
		||||
  - franneck94.c-cpp-runner
 | 
			
		||||
  - ritwickdey.LiveServer
 | 
			
		||||
  - ms-toolsai.jupyter
 | 
			
		||||
  - vscodevim.vim
 | 
			
		||||
  # - vscodevim.vim
 | 
			
		||||
  - ocamllabs.ocaml-platform
 | 
			
		||||
  - stonebuddha.vscode-better-sml
 | 
			
		||||
  - vscode-icons-team.vscode-icons
 | 
			
		||||
| 
						 | 
				
			
			@ -22,4 +20,4 @@ VSCode_Extensions:
 | 
			
		|||
  - platformio.platformio-ide # ORS-63218
 | 
			
		||||
  - stmicroelectronics.stm32-vscode-extension # RA-63703
 | 
			
		||||
  - danielpinto8zz6.c-cpp-compile-run
 | 
			
		||||
  - vadimcn.vscode-lldb
 | 
			
		||||
  # - vadimcn.vscode-lldb
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
# Digitalna forenzika
 | 
			
		||||
# Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 | 
			
		||||
# Windows, GNU/Linux, GNS3, VirtualBox
 | 
			
		||||
- include_tasks: GNS3.yml
 | 
			
		||||
- include_tasks: gns3.yml
 | 
			
		||||
- include_tasks: virtualbox.yml
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +0,0 @@
 | 
			
		|||
- name: GNS3 na Windows ne deluje
 | 
			
		||||
  debug:
 | 
			
		||||
    msg: "GNS3 na Windows zaenkrat ne vklapljamo"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
# Komunikacijski protokoli in omrežna varnost
 | 
			
		||||
# Aleks.Huc@fri.uni-lj.si, Gasper.FeleZorz@fri.uni-lj.si
 | 
			
		||||
# Windows, GNU/Linux, GNS3, VirtualBox
 | 
			
		||||
- include_tasks: GNS3.yml
 | 
			
		||||
- include_tasks: gns.yml
 | 
			
		||||
- include_tasks: virtualbox.yml
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +0,0 @@
 | 
			
		|||
# Kriptografija in računalniška varnost
 | 
			
		||||
# Klemen.Klanjscek@fri.uni-lj.si, Janos.Vidali@fri.uni-lj.si
 | 
			
		||||
# GNU/Linux, SageMath, Python 3, Jupyter Notebook, OpenSSL, OpenSSH client
 | 
			
		||||
 | 
			
		||||
- include_tasks: sagemath.yml
 | 
			
		||||
- include_tasks: jupyter.yml
 | 
			
		||||
- include_tasks: openssl.yml
 | 
			
		||||
| 
						 | 
				
			
			@ -1,11 +0,0 @@
 | 
			
		|||
# Principi programskih jezikov
 | 
			
		||||
# Klemen.Klanjscek@fri.uni-lj.si
 | 
			
		||||
# Windows, GNU/Linux, VS Code, Ocaml, Eclipse, Haskell, SWI-Prolog, rlwrap
 | 
			
		||||
 | 
			
		||||
- include_tasks: vscode.yml
 | 
			
		||||
- include_tasks: ocaml.yml
 | 
			
		||||
- include_tasks: eclipse.yml
 | 
			
		||||
- include_tasks: haskell.yml
 | 
			
		||||
- include_tasks: swi-prolog.yml
 | 
			
		||||
- include_tasks: rlwrap.yml
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -13,7 +13,6 @@
 | 
			
		|||
- import_tasks: IVZ-63521.yml
 | 
			
		||||
- import_tasks: KCR-63550.yml
 | 
			
		||||
- import_tasks: KPOV-63716.yml
 | 
			
		||||
- import_tasks: KRV-63528.yml
 | 
			
		||||
- import_tasks: MRO-63257.yml
 | 
			
		||||
- import_tasks: MV-63288.yml
 | 
			
		||||
- import_tasks: NDN-63729.yml
 | 
			
		||||
| 
						 | 
				
			
			@ -32,7 +31,6 @@
 | 
			
		|||
- import_tasks: PB-63707.yml
 | 
			
		||||
- import_tasks: PB2-63713.yml
 | 
			
		||||
- import_tasks: PJC-63769.yml
 | 
			
		||||
- import_tasks: PPJ-63220.yml
 | 
			
		||||
- import_tasks: PS-63261.yml
 | 
			
		||||
- import_tasks: PSP-63287.yml
 | 
			
		||||
- import_tasks: PUI-63768.yml
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,25 +1,25 @@
 | 
			
		|||
- name: Check Haskell install status
 | 
			
		||||
  win_stat:
 | 
			
		||||
    path: C:\ghcup\bin\ghc.exe
 | 
			
		||||
  register: file
 | 
			
		||||
# - name: Check Haskell install status
 | 
			
		||||
#   win_stat:
 | 
			
		||||
#     path: C:\ghcup\bin\ghc.exe
 | 
			
		||||
#   register: file
 | 
			
		||||
 | 
			
		||||
- when: not file.stat.exists
 | 
			
		||||
  block:
 | 
			
		||||
    - name: Download Haskell
 | 
			
		||||
      win_get_url:
 | 
			
		||||
        url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
 | 
			
		||||
        dest: 'C:\'
 | 
			
		||||
      register: download
 | 
			
		||||
# - when: not file.stat.exists
 | 
			
		||||
#   block:
 | 
			
		||||
#     - name: Download Haskell
 | 
			
		||||
#       win_get_url:
 | 
			
		||||
#         url: "https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1"
 | 
			
		||||
#         dest: 'C:\'
 | 
			
		||||
#       register: download
 | 
			
		||||
    
 | 
			
		||||
    - name: Install Haskell
 | 
			
		||||
      win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
 | 
			
		||||
#     - name: Install Haskell
 | 
			
		||||
#       win_command: powershell.exe {{ download.dest }} -InBash -ExistingMsys2Dir C:\msys64
 | 
			
		||||
 | 
			
		||||
    - name: Add Haskell to PATH
 | 
			
		||||
      win_path:
 | 
			
		||||
        elements:
 | 
			
		||||
          C:\ghcup\bin
 | 
			
		||||
#     - name: Add Haskell to PATH
 | 
			
		||||
#       win_path:
 | 
			
		||||
#         elements:
 | 
			
		||||
#           C:\ghcup\bin
 | 
			
		||||
 | 
			
		||||
    - name: Remove temporary files
 | 
			
		||||
      win_file:
 | 
			
		||||
        path: "{{ download.dest }}"
 | 
			
		||||
        state: absent
 | 
			
		||||
#     - name: Remove temporary files
 | 
			
		||||
#       win_file:
 | 
			
		||||
#         path: "{{ download.dest }}"
 | 
			
		||||
#         state: absent
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +0,0 @@
 | 
			
		|||
# We have it at least in git and msys2 but what the hell.
 | 
			
		||||
- name: Install OpenSSL
 | 
			
		||||
  win_chocolatey:
 | 
			
		||||
    name: openssl
 | 
			
		||||
| 
						 | 
				
			
			@ -1 +0,0 @@
 | 
			
		|||
# TODO
 | 
			
		||||
| 
						 | 
				
			
			@ -1,13 +1,9 @@
 | 
			
		|||
VSCode_Extensions:
 | 
			
		||||
  - VisualStudioExptTeam.vscodeintellicode
 | 
			
		||||
  - arthurwang.vsc-prolog
 | 
			
		||||
  - dramforever.vscode-ghc-simple
 | 
			
		||||
  - eamodio.gitlens
 | 
			
		||||
  - justusadam.language-haskell
 | 
			
		||||
  - ms-dotnettools.csdevkit # IS-63714
 | 
			
		||||
  - ms-python.python
 | 
			
		||||
  - ms-vscode.cpptools
 | 
			
		||||
  - ocamllabs.ocaml-platform
 | 
			
		||||
  - stonebuddha.vscode-better-sml
 | 
			
		||||
  - vscode-icons-team.vscode-icons
 | 
			
		||||
  - vscjava.vscode-java-pack
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue